Resolved a conflict locally.

bzr-revno: 77
This commit is contained in:
Raoul Snyman 2008-11-04 08:53:14 +00:00
parent cc5ab4bc4f
commit 893cba185c

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env pythonw
# vim: autoindent shiftwidth=4 expandtab textwidth=80
"""