forked from openlp/openlp
Resolved a conflict locally.
bzr-revno: 77
This commit is contained in:
parent
cc5ab4bc4f
commit
893cba185c
@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env pythonw
|
||||
# vim: autoindent shiftwidth=4 expandtab textwidth=80
|
||||
|
||||
"""
|
||||
|
Loading…
Reference in New Issue
Block a user