[mod_security_crs/el6] Fix conflicts
Athmane Madjoudj
athmane at fedoraproject.org
Thu Sep 13 09:48:29 UTC 2012
commit 4dea13b67d3b7317fe09079b595b0ff3986bc1cc
Author: Athmane Madjoudj <athmane at fedoraproject.org>
Date: Thu Sep 13 10:47:40 2012 +0100
Fix conflicts
mod_security_crs.spec | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/mod_security_crs.spec b/mod_security_crs.spec
index ff2f8ce..1c00ad6 100644
--- a/mod_security_crs.spec
+++ b/mod_security_crs.spec
@@ -1,11 +1,7 @@
Summary: ModSecurity Rules
Name: mod_security_crs
Version: 2.2.5
-<<<<<<< HEAD
-Release: 4%{?dist}
-=======
Release: 5%{?dist}
->>>>>>> master
License: ASL 2.0
URL: http://www.modsecurity.org/
Group: System Environment/Daemons
@@ -69,12 +65,9 @@ rm -rf %{buildroot}
%{_prefix}/lib/modsecurity.d/slr_rules
%changelog
-<<<<<<< HEAD
-=======
* Thu Sep 13 2012 Athmane Madjoudj <athmane at fedoraproject.org> 2.2.5-5
- Enable extra rules sub-package for EPEL.
->>>>>>> master
* Tue Aug 28 2012 Athmane Madjoudj <athmane at fedoraproject.org> 2.2.5-4
- Fix spec for el5
More information about the scm-commits
mailing list