mod_security-rpm/.gitignore at a4d02532a4bc5f91a73099eb1316433d81ae0f2f - mod_security-rpm - Gitea: Git with a cup of tea

demus/mod_security-rpm

Athmane Madjoudj a4d02532a4 Merge branch 'master' into el6

Conflicts:
	.gitignore
	mod_security.conf
	mod_security.spec
	sources

2012-11-15 10:56:34 +01:00

12 lines

301 B

Plaintext

Raw Blame History

 modsecurity-apache_2.5.12.tar.gz
 <<<<<<< HEAD
 /modsecurity-apache_2.6.7.tar.gz
 =======
 /modsecurity-apache_2.5.13.tar.gz
 /modsecurity-apache_2.6.5.tar.gz
 /modsecurity-apache_2.6.6.tar.gz
 /modsecurity-apache_2.6.8.tar.gz
 /modsecurity-apache_2.7.0.tar.gz
 /modsecurity-apache_2.7.1.tar.gz
 >>>>>>> master