commit a811fa9f513bda9463cb9d26202d5abfb9357e75
Merge: 6ffafd9 619c758
Author: Petr Šabata <contyk@xxxxxxxxxx>
Date: Tue Apr 2 13:50:08 2013 +0200
Resolve merge conflicts
.gitignore | 18 +-----------------
perl-DateTime.spec | 25 +++++++++++++++++++++++--
sources | 2 +-
3 files changed, 25 insertions(+), 20 deletions(-)
---
diff --cc .gitignore
index 659ce15,8fb00a1..70b9321
--- a/.gitignore
+++ b/.gitignore
@@@ -1,17 -1,18 +1,1 @@@
--DateTime-Locale-0.45.tar.gz
--DateTime-0.53.tar.gz
--DateTime-TimeZone-1.10.tar.gz
--/DateTime-0.63.tar.gz
--/DateTime-TimeZone-1.22.tar.gz
--/DateTime-0.66.tar.gz
--/DateTime-Locale-0.45.tar.gz
--/DateTime-TimeZone-1.26.tar.gz
--/DateTime-TimeZone-1.31.tar.gz
--/DateTime-TimeZone-1.32.tar.gz
--/DateTime-TimeZone-1.33.tar.gz
--/DateTime-0.69.tar.gz
--/DateTime-TimeZone-1.34.tar.gz
--/DateTime-0.70.tar.gz
--/DateTime-TimeZone-1.35.tar.gz
--/DateTime-0.77.tar.gz
--/DateTime-0.78.tar.gz
+ /DateTime-1.01.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
