Upgrade Scala Native

Author: Antonio Alonso Dominguez

project/plugins.sbt

@@ -1,10 +1,6 @@
 addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.12")
 
-<<<<<<< HEAD
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
-=======
-addSbtPlugin("org.scala-js"     % "sbt-scalajs"              % "0.6.16")
+addSbtPlugin("org.scala-js"     % "sbt-scalajs"              % "0.6.18")
 addSbtPlugin("org.scala-native" % "sbt-crossproject"         % "0.2.0")
 addSbtPlugin("org.scala-native" % "sbt-scalajs-crossproject" % "0.2.0")
-addSbtPlugin("org.scala-native" % "sbt-scala-native"         % "0.2.1")
->>>>>>> Initial support for Scala Native
+addSbtPlugin("org.scala-native" % "sbt-scala-native"         % "0.3.1")