Fix duplicate RPM scriptlet override (sbt#825)

zoosky · Jun 28, 2016 · 75a13d9 · 75a13d9
1 parent 6a834b7
commit 75a13d9
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/src/sbt-test/rpm/scriptlets-override-rpm/build.sbt b/src/sbt-test/rpm/scriptlets-override-rpm/build.sbt
@@ -41,17 +41,11 @@ TaskKey[Unit]("check-spec-file") <<= (target, streams) map { (target, out) =>
     ()
 }
 
-<<<<<<< HEAD
-def countSubstring( str:String, substr:String ) = substr.r.findAllMatchIn(str).length
-
-def isUnique(str:String, searchstr: String) = countSubstring(str, searchstr) == 1
-=======
 def countSubstring(str: String, substr: String): Int =
     substr.r.findAllMatchIn(str).length
 
 def isUnique(str: String, searchstr: String): Boolean =
     countSubstring(str, searchstr) == 1
->>>>>>> 54fb9aa... Fix duplicate RPM scriptlet override (#825)
 
 TaskKey[Unit]("unique-scripts-in-spec-file") <<= (target, streams) map { (target, out) =>
     val spec = IO.read(target / "rpm" / "SPECS" / "rpm-test.spec")