anorm 2.8.0

(cherry picked from commit 7a47b99) # Conflicts: # play-scala-anorm-example/build.sbt
playframework · Nov 17, 2024 · 531bbdb · 531bbdb
1 parent 37a13d3
commit 531bbdb
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/play-scala-anorm-example/build.sbt b/play-scala-anorm-example/build.sbt
@@ -11,8 +11,13 @@ lazy val root = (project in file("."))
       jdbc,
       evolutions,
       "com.h2database" % "h2" % "2.3.232",
+<<<<<<< HEAD
       "org.playframework.anorm" %% "anorm" % "2.7.0",
       "org.scalatestplus.play" %% "scalatestplus-play" % "6.0.1" % Test,
+=======
+      "org.playframework.anorm" %% "anorm" % "2.8.0",
+      "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test,
+>>>>>>> 7a47b99f (anorm 2.8.0)
     ),
     scalacOptions ++= List("-feature", "-Werror"),
     javacOptions ++= List("-Xlint:unchecked", "-Xlint:deprecation", "-Werror"),