[gparted/f18] Fix merge conflict in sources

[Deji Akingunola]

commit 598d299496e9ec8157fc17d716e8909f1eeac966
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Mon Jun 10 22:56:36 2013 -0400

    Fix merge conflict in sources

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 2b7cd9c..41c39b1 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-1ffe859c70e102a776dffb1ff0a2164a  gparted-0.14.1.tar.bz2
-=======
 3f399bff031b5ce14d11a8c346f4b89c  gparted-0.16.1.tar.bz2
->>>>>>> master