From 4499a8990b108c8188fc6df0c04e037d75384f56 Mon Sep 17 00:00:00 2001
From: David Abdurachmanov <david.abdurachmanov@sifive.com>
Date: Sat, 25 Apr 2020 10:39:31 +0300
Subject: [PATCH] Fix merge

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
---
 hdf.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hdf.spec b/hdf.spec
index 9ee420d..69dd767 100644
--- a/hdf.spec
+++ b/hdf.spec
@@ -121,7 +121,6 @@ ln -s %{_javadir}/slf4j/simple.jar java/lib/ext/slf4j-simple-1.7.5.jar
 # Fix test output
 junit_ver=$(sed -n '/<version>/{s/^.*>\([0-9]\.[0-9]*\)<.*/\1/;p;q}' /usr/share/maven-poms/junit.pom)
 sed -i -e "s/JUnit version .*/JUnit version $junit_ver/" java/test/testfiles/JUnit-*.txt
->>>>>>> up/master
 
 ## Fix syntax error bacause 'CLASSPATH_ENV=$H4_CLASSPATH' line on epel6 builds
 # Use only if java is disabled