commit fa307deb2fde564eac0ac44d27e0b084de8768d6
Author: Nathanael D. Noblet <nathanael@xxxxxxx>
Date: Sat Dec 3 12:17:19 2011 -0700
missed conflict
dspam.spec | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/dspam.spec b/dspam.spec
index 51e1370..d373c49 100644
--- a/dspam.spec
+++ b/dspam.spec
@@ -11,11 +11,7 @@
Summary: A library and Mail Delivery Agent for Bayesian SPAM filtering
Name: dspam
Version: 3.10.1
-<<<<<<< HEAD
-Release: 1%{?dist}
-=======
Release: 5%{?dist}
->>>>>>> bde11ce... enable clamav
License: GPLv2
Group: System Environment/Daemons
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
--
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
