Changeset 5141ed8

Timestamp:

Jan 21, 2012, 3:31:15 PM (12 years ago)

Author:

Daniel Cooper <danny@…>

Branches:

no-cups

Children:

72c3fcb

Parents:

8de3c81

git-author:

Daniel Cooper <danny@…> (01/21/12 15:31:15)

git-committer:

Daniel Cooper <danny@…> (01/21/12 15:31:15)

Message:

fixed merge conflict in last commit

File:

• server/lib/gutenbach/server/requests.py (modified) (2 diffs)

server/lib/gutenbach/server/requests.py

@@ -896 +896 @@
     @handler_for(ipp.OperationCodes.SEND_URI)
     def send_uri(self, request, response):
-<<<<<<< HEAD
        raise ipp.errors.ServerErrorOperationNotSupported
-=======
         """3.2.2 Send URI
 
@@ -1028 +1026 @@
         response.attribute_groups.append(ipp.AttributeGroup(
             ipp.AttributeTags.JOB, attrs))
->>>>>>> 7c8a2f82df069878680146d8ac18339ec96bd487
 
     @handler_for(ipp.OperationCodes.GET_JOB_ATTRIBUTES)