Fix merge

harana-oss · Dec 17, 2024 · 616a2e9 · 616a2e9
1 parent 6cc25bc
commit 616a2e9
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,9 +1,5 @@
 val scalaJSVersion =
-<<<<<<< HEAD
   Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.17.0")
-=======
-  Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.9.0")
->>>>>>> parent of f00317e (Allows derivation fallback messages to be suppressed)
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)