[perl-XML-TreeBuilder] Fix sources and .gitignore

[Jitka Plesnikova]

commit 2df5b3b3fd32675611683153947192e91dccc4fd
Author: Jitka Plesnikova <jplesnik at redhat.com>
Date:   Wed Aug 6 15:55:11 2014 +0200

    Fix sources and .gitignore

 .gitignore |    3 ---
 sources    |    4 ----
 2 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 87a7624..6ae9e00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
 XML-TreeBuilder-3.09.tar.gz
 /XML-TreeBuilder-4.0.tar.gz
-<<<<<<< HEAD
 /XML-TreeBuilder-5.4.tar.gz
-=======
 /XML-TreeBuilder-4.2.tar.gz
 /XML-TreeBuilder-5.0.tar.gz
 /XML-TreeBuilder-5.1.tar.gz
->>>>>>> c2ced084ca0889396f28a47aaa6655a188a4fd0b
diff --git a/sources b/sources
index b6070fd..90c3684 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
 bf2d9102b62516f6e76c248acb9e8a2c  XML-TreeBuilder-5.4.tar.gz
-=======
-05a08a652fa2861cb56ce50c1b89eb40  XML-TreeBuilder-5.1.tar.gz
->>>>>>> c2ced084ca0889396f28a47aaa6655a188a4fd0b