commit 4fe100043a53795967bd5214086509928494b043 Author: Nathanael D. Noblet nathanael@gnat.ca Date: Sat Dec 3 12:15:03 2011 -0700
fix missed conflict
dspam.spec | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) --- diff --git a/dspam.spec b/dspam.spec index dac11a4..e2338d0 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/%%7Bname%7D/%%7Bname%7D-%%7Bversion%7D.tar....