chore(base): resolved merge-conflict

#5 [Story] Create User Sessions
2025-10-26 11:24:05 +01:00
parent bef96ba7e3
commit d87348f13f
13 changed files with 114 additions and 44 deletions
--- a/build.sbt
+++ b/build.sbt
@@ -37,7 +37,8 @@ lazy val knockoutwhistweb = project.in(file("knockoutwhistweb"))
  .dependsOn(knockoutwhist % "compile->compile;test->test")
  .settings(
    commonSettings,
-    libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.2" % Test
+    libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.2" % Test,
+    libraryDependencies += "de.mkammerer" % "argon2-jvm" % "2.12"
  )

 lazy val root = (project in file("."))