chore(base): resolved merge-conflict

#5 [Story] Create User Sessions
2025-10-26 11:24:05 +01:00
parent 1517d0c006
commit 403ca73594
13 changed files with 114 additions and 44 deletions
--- a/knockoutwhistweb/app/views/sessions.scala.html
+++ b/knockoutwhistweb/app/views/sessions.scala.html
@@ -1,4 +1,5 @@
-@(sessions: List[controllers.sessions.PlayerSession])
+@import model.sessions.PlayerSession
+@(sessions: List[PlayerSession])

@main("Sessions") {
    <div id="sessions">