[rednotebook/f14/master] Removed conflict

[Fabian Affolter]

commit 916803c512086b52abe75bec5dff9842686a6fe8
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Sun Mar 6 15:58:30 2011 +0100

    Removed conflict

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 8aed3a8..f7b6839 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-cd7981ed3017a96900c6a72d95f464d0  rednotebook-1.1.2.tar.gz
-=======
 b1ed82e516ec53d0c1903f61782dd5a3  rednotebook-1.1.3.tar.gz
->>>>>>> master