Resolved a conflict locally.

bzr-revno: 77
2008-11-04 08:53:14 +00:00 · 2008-11-04 08:53:14 +00:00 · 893cba185c
parent cc5ab4bc4f
commit 893cba185c
1 changed files with 1 additions and 1 deletions
--- a/openlp.pyw
+++ b/openlp.pyw
@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env pythonw
 # vim: autoindent shiftwidth=4 expandtab textwidth=80

 """