[perl-Fsdb/f19: 4/5] resolve prior conflict

[John Heidemann]

commit 841165309c4c0c1d496694b59362a6edd0bfdd1b
Author: John Heidemann <johnh at isi.edu>
Date:   Thu Nov 27 08:07:15 2014 -0800

    resolve prior conflict

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index ba58d66..6d956c8 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-741c38fdc829e5460854087d27b1c516  Fsdb-2.51.tar.gz
-=======
 e727052b3162124a51f9deb54f97fea4  Fsdb-2.52.tar.gz
->>>>>>> master