From 4cdb0d88a065df2456b3e12389836eebc9b2fa4a Mon Sep 17 00:00:00 2001 From: Dennis Kobert Date: Fri, 31 May 2019 16:40:00 +0200 Subject: Fix issues in Collide --- game_server/src/main.rs | 3 --- 1 file changed, 3 deletions(-) (limited to 'game_server/src/main.rs') diff --git a/game_server/src/main.rs b/game_server/src/main.rs index e10fe3c..cfd9787 100644 --- a/game_server/src/main.rs +++ b/game_server/src/main.rs @@ -1,12 +1,9 @@ mod group; mod maths; mod scribble_group; -<<<<<<< Updated upstream -======= mod webhogg_group; mod webhogg_game; mod collide; ->>>>>>> Stashed changes mod lobby; mod server; mod backend_connection; -- cgit v1.2.3-54-g00ecf