commit e756b5fb1c09d7e4d629d0065298faf663d49e14
Author: Nathanael d. Noblet <nathanael@xxxxxxx>
Date: Wed Sep 22 10:20:17 2010 -0600
fix merge issue
dspam.spec | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/dspam.spec b/dspam.spec
index 6510d58..750cca0 100644
--- a/dspam.spec
+++ b/dspam.spec
@@ -361,24 +361,15 @@ exit 0
%config(noreplace) %{_sysconfdir}/httpd/conf.d/dspam-web.conf
%changelog
-<<<<<<< HEAD
-<<<<<<< HEAD
-* Tue Jul 13 2010 Nathanael Noblet <nathanael@xxxxxxx> - 3.9.0-7
-- Fix dspam data dir permissions to be writeable by mail (Reported by Jonas Pasche)
-* Wed Mar 3 2010 Nathanael Noblet <nathanael@xxxxxxx> - 3.9.0-6
-=======
-=======
* Wed Sep 22 2010 Nathanael Noblet <nathanael@xxxxxxx> - 3.9.0-9
- Update cron job to be silent on success
- Patch hash utils
->>>>>>> origin/master
* Tue Jul 13 2010 Nathanael Noblet <nathanael@xxxxxxx> - 3.9.0-8
- Fix dspam data dir permissions to be writeable by mail (Reported by Jonas Pasche)
* Wed Mar 3 2010 Nathanael Noblet <nathanael@xxxxxxx> - 3.9.0-7
->>>>>>> origin/master
- Updated dspam initscript default start position to be after DBs
- reset initscript priorities
--
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
