[scantailor/f15] Fixed wrongly merged 'source' file
Jan Horak
xhorak at fedoraproject.org
Wed Feb 1 14:14:09 UTC 2012
commit ba280b04ea3b884e4ecce90cecd9b8b5282959ee
Author: Jan Horak <jhorak at redhat.com>
Date: Wed Feb 1 15:14:04 2012 +0100
Fixed wrongly merged 'source' file
sources | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 54045b2..a8f9830 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-f962c93a2d63b449fa3f6612ade3b028 scantailor-0.9.10.tar.gz
-=======
15984c8828ecb2de542ac94e3c41a810 scantailor-0.9.11.tar.gz
->>>>>>> master
More information about the scm-commits
mailing list