[perl-Fsdb/f19] merge

[John Heidemann]

commit 443d852f4243432b92cddb318b6d5f6ba8614461
Author: John Heidemann <johnh at isi.edu>
Date:   Mon Nov 3 22:56:57 2014 -0800

    merge

 perl-Fsdb.spec |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/perl-Fsdb.spec b/perl-Fsdb.spec
index 64217ba..bb6c8a0 100644
--- a/perl-Fsdb.spec
+++ b/perl-Fsdb.spec
@@ -1,10 +1,6 @@
 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