[mate-text-editor/f20] fix merge conflicts in sources
Wolfgang Ulbrich
raveit65 at fedoraproject.org
Wed Jan 1 15:35:53 UTC 2014
commit d6533b7bd1964e21b0858818a5ad05023197cbad
Author: raveit65 <chat-to-me at raveit.de>
Date: Wed Jan 1 16:35:47 2014 +0100
fix merge conflicts in sources
sources | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 194bfaf..37c5051 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
3cfbd6d709b74e57b9b907c141ba5fdb mate-text-editor-1.6.1.tar.xz
-=======
-6bf33a42e00a716b878b2991550edd57 mate-text-editor-1.7.0.tar.gz
->>>>>>> master
More information about the scm-commits
mailing list