Fix formatting rules

Test joining a room twice
2024-05-09 17:25:20 +02:00 · 2024-05-09 17:25:04 +02:00
1 changed files with 0 additions and 4 deletions
--- a/crates/lavina-core/src/repo/room.rs
+++ b/crates/lavina-core/src/repo/room.rs
@ -15,10 +15,6 @@ impl Storage {
                    memberships
                where
                    user_id = ? and room_id = ?;
-<<<<<<< HEAD
-
-=======
->>>>>>> 775f43a (Fix query)
                ",
        )
        .bind(player_id)
Author	SHA1	Message	Date
Mikhail	eeffa212f0	Fix formatting rules	2024-05-09 17:25:20 +02:00
Mikhail	e9d777b16d	Test joining a room twice	2024-05-09 17:25:04 +02:00