From 7e6f5e07a7ca05f7f5eb60dc0ed0f101d41e9c42 Mon Sep 17 00:00:00 2001
From: ianb <devnull@localhost>
Date: Tue, 13 Dec 2005 07:34:56 +0000
Subject: Fixed conflicts I accidentally committed

---
 paste/httpexceptions.py | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'paste')

diff --git a/paste/httpexceptions.py b/paste/httpexceptions.py
index c38618c..5b64472 100644
--- a/paste/httpexceptions.py
+++ b/paste/httpexceptions.py
@@ -384,11 +384,7 @@ class HTTPNotAcceptable(HTTPClientError):
                 'acceptable to your browser (content\nof type '
                 '%(HTTP_ACCEPT)s).\n%(detail)s')
 
-<<<<<<< .working
-class HTTPConflict(HTTPException):
-=======
 class HTTPConflict(HTTPClientError):
->>>>>>> .merge-right.r4008
     code = 409
     title = 'Conflict'
     explanation = ('There was a conflict when trying to complete '
@@ -460,15 +456,10 @@ class HTTPServerError(HTTPError):
     title = 'Internal Server Error'
     explanation = ('An internal server error occurred.')
 
-<<<<<<< .working
-class HTTPNotImplemented(HTTPException):
-    code = 501
-=======
 HTTPInternalServerError = HTTPServerError
        
 class HTTPNotImplemented(HTTPServerError):
     code = 501
->>>>>>> .merge-right.r4008
     title = 'Not Implemented'
     # override template since we need an environment variable
     template = ('The request method %(REQUEST_METHOD)s is not implemented '
-- 
cgit v1.2.1