[merkaartor/f13/master: 2/2] solve conflict
Sven Lankes
slankes at fedoraproject.org
Sun Aug 29 21:39:40 UTC 2010
commit ac6a96468235b9cb3e4c965e820d346a485b0e0e
Merge: 494bff0 1d04b0a
Author: Sven Lankes <sven at lank.es>
Date: Sun Aug 29 23:39:15 2010 +0200
solve conflict
.gitignore | 2 +-
merkaartor.spec | 12 ++++++++----
sources | 2 +-
3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 745f4e0,1144679..1779b6e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,1 @@@
- merkaartor-0.16.2.tar.bz2
-merkaartor-0.16.1.tar.bz2
-/merkaartor-0.16.2.tar.bz2
-/merkaartor-0.16.3.tar.bz2
++merkaartor-0.16.3.tar.bz2
More information about the scm-commits
mailing list