commit 63b2eec844b22e2c0d35c1dba6bf63e00abc3dda
Merge: 6497b2f bb2e2bf
Author: John Heidemann <[email protected]>
Date: Mon Nov 3 22:55:45 2014 -0800
merge
.gitignore | 1 +
perl-Fsdb.spec | 8 ++++++++
sources | 4 ++++
3 files changed, 13 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index 8558e2c,45b6d9d..93ef35e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,3 @@@
/Fsdb-2.50.tar.gz
+/Fsdb-2.51.tar.gz
+ /Fsdb-2.52.tar.gz
-
diff --cc perl-Fsdb.spec
index b266a0d,8e4524e..64217ba
--- a/perl-Fsdb.spec
+++ b/perl-Fsdb.spec
@@@ -1,6 -1,6 +1,10 @@@
Summary: A set of commands for manipulating flat-text databases from the shell
Name: perl-Fsdb
++<<<<<<< HEAD
+Version: 2.51
++=======
+ Version: 2.52
++>>>>>>> master
Release: 1%{?dist}
License: GPLv2
Group: Development/Libraries
@@@ -100,5 -100,5 +104,9 @@@ rm -rf $RPM_BUILD_ROO
%changelog
++<<<<<<< HEAD
+* Fri Sep 05 2014 John Heidemann <[email protected]> 2.51-1
++=======
+ * Mon Nov 03 2014 John Heidemann <[email protected]> 2.52-1
++>>>>>>> master
- See http://www.isi.edu/~johnh/SOFTWARE/FSDB/
diff --cc sources
index 152cac3,6d956c8..ba58d66
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
+741c38fdc829e5460854087d27b1c516 Fsdb-2.51.tar.gz
++=======
+ e727052b3162124a51f9deb54f97fea4 Fsdb-2.52.tar.gz
++>>>>>>> master
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
[email protected]
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
