diff --git a/play-scala-anorm-example/build.sbt b/play-scala-anorm-example/build.sbt index bfc0a80d4..a3e31714f 100644 --- a/play-scala-anorm-example/build.sbt +++ b/play-scala-anorm-example/build.sbt @@ -11,11 +11,15 @@ lazy val root = (project in file(".")) jdbc, evolutions, "com.h2database" % "h2" % "2.3.232", +<<<<<<< HEAD <<<<<<< 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.playframework.anorm" %% "anorm" % "2.8.1", +>>>>>>> 3c73d083 (Anorm 2.8.1) "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test, >>>>>>> 7a47b99f (anorm 2.8.0) ),