rpms/wordpress
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove merge marker

Browse source
This commit is contained in:
Matěj Cepl 2012-12-28 09:57:12 +01:00
commit 90015cc4e2
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
wordpress.spec
View file

@ -191,7 +191,6 @@ rm -rf ${RPM_BUILD_ROOT}
- New upstream beta1 version
- Don’t even bother with removing gettext.php ... it is not used anymore
>>>>>>> master
* Thu Sep 06 2012 Matej Cepl <mcepl@redhat.com> - 3.4.2-2
- Upstream security update.