Fix formatting rules

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