[berusky2: 8/8] merge fix

Martin Stransky stransky at fedoraproject.org
Sun Feb 24 20:48:26 UTC 2013


commit 595369e960f8f671b7aba3610f61fda38f956657
Merge: a1ff53d 802d25a
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Sun Feb 24 21:48:02 2013 +0100

    merge fix

 .gitignore    |    1 +
 berusky2.spec |   10 +++++-----
 sources       |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 9ec458b,d7e76c7..d5091b9
--- a/.gitignore
+++ b/.gitignore
@@@ -2,4 -2,4 +2,5 @@@
  /berusky2-0.6.tar.gz
  /berusky2-0.6.1.tar.gz
  /berusky2-0.7.tar.gz
 +/berusky2-0.8.tar.gz
+ /berusky2-0.9.tar.gz


More information about the scm-commits mailing list