[perl-Fsdb/f19] merge

[John Heidemann]

commit abda86fe66d403b5dafda316d37c68f2c3d323d4
Author: John Heidemann <johnh at isi.edu>
Date:   Mon Nov 3 22:57:41 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 bb6c8a0..8e4524e 100644
--- a/perl-Fsdb.spec
+++ b/perl-Fsdb.spec
@@ -100,9 +100,5 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-<<<<<<< HEAD
-* Fri Sep 05 2014 John Heidemann <johnh at isi.edu> 2.51-1
-=======
 * Mon Nov 03 2014 John Heidemann <johnh at isi.edu> 2.52-1
->>>>>>> master
 - See http://www.isi.edu/~johnh/SOFTWARE/FSDB/