- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

12 years ago · 0852a8c1ca
parent f13cf841cc
commit 0852a8c1ca
1 changed files with 3 additions and 0 deletions
--- a/libsvm.spec
+++ b/libsvm.spec
@ -245,6 +245,7 @@ rm -rf $RPM_BUILD_ROOT


 %changelog
+<<<<<<< HEAD
 * Mon Apr 28 2014 Ding-Yi Chen <dchen@redhat.com> - 3.18-2
 - Fixed Bug 1090844 - libsvm-java has unresolved dependencies on epel6 testing

@ -257,6 +258,8 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Mar 28 2014 Michael Simacek <msimacek@redhat.com> - 3.17-4
 - Use Requires: java-headless rebuild (#1067528)

+=======
+>>>>>>> - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.17-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild