fix merge leftovers

This commit is contained in:
Karsten Hopp 2015-06-10 10:22:14 +02:00
parent 64c313ac9d
commit 138827fb79

View File

@ -2230,7 +2230,6 @@ rm -rf %{buildroot}
* Wed Jun 10 2015 Karsten Hopp <karsten@redhat.com> 7.4.737-1
- patchlevel 737
<<<<<<< HEAD
* Thu May 14 2015 Karsten Hopp <karsten@redhat.com> 7.4.729-1
- patchlevel 729