clamav/.gitignore
Nick Bebout 98d8227630 Merge branch 'el6' into el5
Conflicts:
	.gitignore
	clamav.spec
	clamd-wrapper
	sources
2011-02-21 16:33:19 -06:00

7 lines
116 B
Plaintext

<<<<<<< HEAD
clamav-0.95.1-norar.tar.bz2
=======
clamav-0.95.3-norar.tar.bz2
/clamav-0.97-clean.tar.bz2
>>>>>>> el6