Anorm 2.8.1

(cherry picked from commit 3c73d08) # Conflicts: # scala/anorm/build.sbt
playframework · Nov 17, 2024 · e71d713 · e71d713
1 parent 6bda936
commit e71d713
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/scala/anorm/build.sbt b/scala/anorm/build.sbt
@@ -17,8 +17,12 @@ lazy val root = (project in file("."))
       "org.playframework.anorm" %% "anorm" % "2.7.0",
 =======
       "com.h2database" % "h2" % "2.3.232",
+<<<<<<< HEAD:scala/anorm/build.sbt
       "org.playframework.anorm" %% "anorm" % "2.8.0",
 >>>>>>> 7a47b99f (anorm 2.8.0):play-scala-anorm-example/build.sbt
+=======
+      "org.playframework.anorm" %% "anorm" % "2.8.1",
+>>>>>>> 3c73d083 (Anorm 2.8.1):play-scala-anorm-example/build.sbt
       "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test,
     ),
     scalacOptions ++= List("-feature", "-Werror"),