Resolve merge conflict

2018-10-21 21:35:34 +02:00
parent 6ecbb892cf 7e66211728
commit 2b095ff71c
4 changed files with 22 additions and 30 deletions
--- a/Client/index.js
+++ b/Client/index.js
@@ -7,13 +7,10 @@

 require('./Login/main.js');
 require('./Save/main.js');
-require('./Save/save.js');
 require('./Gui/deathscreen.js');
 require('./Gui/infobox.js');
 require('./Gui/playerlist.js');
-require('./Login/main.js');
 require('./Player/keys.js');
-require('./Save/main.js');
-
+require('./Player/waypoint.js');
 require('./FactionManagement/main.js');