Spray fixed

frameworks/Scala/spray/build.sbt

@@ -1,17 +1,8 @@
-<<<<<<< HEAD
-=======
-import spray.revolver.RevolverPlugin
-
->>>>>>> upstream/master
 name := "spray-benchmark"
 
 organization := "io.spray"
 
-<<<<<<< HEAD
 scalaVersion := "2.11.8"
-=======
-scalaVersion := "2.11.7"
->>>>>>> upstream/master
 
 version := "1.0"
 
@@ -20,23 +11,9 @@ resolvers ++= Seq(
 )
 
 libraryDependencies ++= Seq(
-<<<<<<< HEAD
   "io.spray" %% "spray-json" % "1.3.1",
   "io.spray" %% "spray-can" % "1.3.1",
   "com.typesafe.akka" %%  "akka-actor" % "2.4.7",
   "com.typesafe.akka" %%  "akka-slf4j" % "2.4.7",
   "ch.qos.logback"% "logback-classic" % "1.0.12" % "runtime"
 )
-=======
-  "io.spray" %% "spray-json" % "1.3.2",
-  "io.spray" % "spray-can" % "1.1-20130619",
-  "com.typesafe.akka" %%  "akka-actor" % "2.4.1",
-  "com.typesafe.akka" %%  "akka-slf4j" % "2.4.1",
-  "ch.qos.logback"% "logback-classic" % "1.0.12" % "runtime",
-  "org.scala-lang" % "scala-xml" % "2.11.0-M4"
-)
-
-RevolverPlugin.settings
-
-sbtassembly.AssemblyPlugin.assemblySettings
->>>>>>> upstream/master

frameworks/Scala/spray/project/build.properties

@@ -1,5 +1 @@
-<<<<<<< HEAD
 sbt.version=0.13.11
-=======
-sbt.version=0.13.9
->>>>>>> upstream/master

frameworks/Scala/spray/project/plugins.sbt

@@ -1,9 +1,3 @@
 addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0")
 
-<<<<<<< HEAD
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3")
-=======
-addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0")
-
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.1")
->>>>>>> upstream/master

frameworks/Scala/spray/setup.sh

@@ -1,10 +1,6 @@
 #!/bin/bash
 
-<<<<<<< HEAD
 fw_depends java8 scala sbt
-=======
-fw_depends java scala sbt
->>>>>>> upstream/master
 
 sbt assembly -batch
 

frameworks/Scala/spray/src/main/resources/logback.xml

@@ -12,4 +12,4 @@
         <appender-ref ref="CONSOLE"/>
     </root>
 
-</configuration>
+</configuration>