From fce0830e562c9e1d631ceeef9c509b8f6507d0f8 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Fri, 5 Dec 2008 18:02:27 +0000
Subject: [PATCH] Resolved conflicts

bzr-revno: 181
---
 .eric4project/openlp.org 2.0.e4q | 2 +-
 openlp.org 2.0.e4p               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.eric4project/openlp.org 2.0.e4q b/.eric4project/openlp.org 2.0.e4q
index 3e0966ce7..5fdfd8feb 100644
--- a/.eric4project/openlp.org 2.0.e4q	
+++ b/.eric4project/openlp.org 2.0.e4q	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE UserProject SYSTEM "UserProject-4.0.dtd">
 <!-- eric4 user project file for project openlp.org 2.0 -->
-<!-- Saved: 2008-12-03, 15:55:06 -->
+<!-- Saved: 2008-12-03, 23:36:03 -->
 <!-- Copyright (C) 2008 Raoul Snyman, raoulsnyman@openlp.org -->
 <UserProject version="4.0">
 </UserProject>
\ No newline at end of file
diff --git a/openlp.org 2.0.e4p b/openlp.org 2.0.e4p
index d1e18149f..c3ccd3ab9 100644
--- a/openlp.org 2.0.e4p	
+++ b/openlp.org 2.0.e4p	
@@ -82,6 +82,7 @@
     <Source>openlp/core/utils/winregistry.py</Source>
     <Source>openlp/core/utils/registry.py</Source>
     <Source>openlp/core/utils/linregistry.py</Source>
+    <Source>setup.py</Source>
     <Source>openlp/core/lib/pluginconfig.py</Source>
   </Sources>
   <Forms>