[OpenLP/f17] 1.9.10-2.

[Tim Bentley]

commit 5d10f74a3675f7fca8dc2fc2842bad7902aa623b
Author: Tim Bentley <Tim.Bentley at gmail.com>
Date:   Sat Jun 23 19:49:52 2012 +0100

    1.9.10-2.

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index a803e8b..e46bd08 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-e64de9e14be9ce0944b27db996a9c3b8  OpenLP-1.9.9.tar.gz
-=======
 2c8eb587a56cc6e31f64ebee052b2842  OpenLP-1.9.10.tar.gz
->>>>>>> master