From 5e0873a54f8b32a1641e4095c68fc291927d74bb Mon Sep 17 00:00:00 2001
From: Ding-Yi Chen <dingyichen@gmail.com>
Date: Tue, 22 Apr 2014 10:29:04 +1000
Subject: [PATCH] libsvm-3.18

---
 libsvm.spec | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libsvm.spec b/libsvm.spec
index 6503de3..0580eff 100644
--- a/libsvm.spec
+++ b/libsvm.spec
@@ -81,16 +81,12 @@ Group:      Development/Libraries
 BuildRequires:  java-devel >= 1.5.0
 BuildRequires:  jpackage-utils
 
-<<<<<<< HEAD
 %if 0%{?rhel} <= 6
 Requires:  java >= 1.5.0
 %else
 Requires:  java-headless >= 1.5.0
 %endif 
 
-=======
-Requires:  java-headless >= 1.5.0
->>>>>>> Use Requires: java-headless rebuild (#1067528)
 Requires:  jpackage-utils
 Requires:       %{name} = %{version}-%{release}