[sugar-flip] v4

[Kalpa Welivitigoda]

commit 14a8baace2b130a59ff57d70280204a38d6029fc
Author: Kalpa Welivitigoda <callkalpa at gmail.com>
Date:   Thu May 24 22:01:33 2012 +0530

    v4

 sources |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/sources b/sources
index 737ec29..fbc1e54 100644
--- a/sources
+++ b/sources
@@ -1,7 +1 @@
-<<<<<<< HEAD
 661f20b4d85612233c53c34939290946  Flip-4.tar.bz2
-||||||| merged common ancestors
-1d57792332931cc289d3bec141f60ac4  Flip-3.tar.bz2
-=======
-ee4d833558d89da4e98e8f32c1900754  Flip-4.tar.bz2
->>>>>>> 08083620db2093a2cdc4e66bfee59c645d9bc3db