commit 02ff7b893124f6ea9ecd789e326abe46bd3a5f86
Author: Jose Pedro Oliveira <jpo@xxxxxxxxxxxx>
Date: Sat Feb 8 20:56:18 2014 +0000
Clean conflict lines
.gitignore | 4 ----
sources | 4 ----
2 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e931f4b..4e12420 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,4 @@
pmtools-1.10.tar.gz
-<<<<<<< HEAD
-/pmtools-1.54.tar.gz
-=======
/pmtools-1.30.tar.gz
/pmtools-1.54.tar.gz
/pmtools-2.0.0.tar.gz
->>>>>>> master
diff --git a/sources b/sources
index b6b18b8..fb2d431 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-1a83a0209f3fde110f65647a9741c442 pmtools-1.54.tar.gz
-=======
a48ffb1abe14d2e05839fc6a48433665 pmtools-2.0.0.tar.gz
->>>>>>> master
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
