From 2ee46f762ee468471783d92eaede959b5b7532f3 Mon Sep 17 00:00:00 2001
From: Andrea Veri <[email protected]>
Date: Wed, 20 Apr 2016 12:10:19 +0200
Subject: Fix conflicts on sources file
---
sources | 3 ---
1 file changed, 3 deletions(-)
diff --git a/sources b/sources
index b08abfb..6c30775 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
250dd8951c9a9e6cfccddad04d8096b9 File-Touch-0.09.tar.gz
-=======
caf4101a022f66c88f5fb4383b3f6388 File-Touch-0.11.tar.gz
->>>>>>> acb7802... New upstream release: 0.11
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/perl-File-Touch.git/commit/?h=f23&id=2ee46f762ee468471783d92eaede959b5b7532f3
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
[email protected]
http://lists.fedoraproject.org/admin/lists/[email protected]
