fix merge leftovers
This commit is contained in:
parent
64c313ac9d
commit
138827fb79
1
vim.spec
1
vim.spec
@ -2230,7 +2230,6 @@ rm -rf %{buildroot}
|
|||||||
* Wed Jun 10 2015 Karsten Hopp <karsten@redhat.com> 7.4.737-1
|
* Wed Jun 10 2015 Karsten Hopp <karsten@redhat.com> 7.4.737-1
|
||||||
- patchlevel 737
|
- patchlevel 737
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
* Thu May 14 2015 Karsten Hopp <karsten@redhat.com> 7.4.729-1
|
* Thu May 14 2015 Karsten Hopp <karsten@redhat.com> 7.4.729-1
|
||||||
- patchlevel 729
|
- patchlevel 729
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user