Changeset b77e57e for server/lib/gutenbach/server/requests.py

Timestamp:

Jan 21, 2012, 9:03:09 PM (12 years ago)

Author:

Daniel Cooper <danny@…>

Branches:

no-cups

Children:

3cb6c7b

Parents:

079ef11 (diff), 7e29e6a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Daniel Cooper <danny@…> (01/21/12 21:03:09)

git-committer:

Daniel Cooper <danny@…> (01/21/12 21:03:09)

Message:

Merge branch 'no-cups' of github.com:jhamrick/gutenbach into no-cups

Conflicts:

server/lib/gutenbach/server/requests.py

File:

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

server/lib/gutenbach/server/requests.py

@@ -169 +169 @@
 
         """
+
         operation = request.attribute_groups[0]
         document = request.data        
@@ -178 +179 @@
         compression = None
         last_document = None
-
-
         # requested printer uri
         if 'printer-uri' not in operation: