From 283767a14b07534d6575e94d56dc03dbcbf63247 Mon Sep 17 00:00:00 2001
From: Armin Benz <armin.benz@blackforestbytes.de>
Date: Fri, 14 Apr 2017 01:22:54 +0200
Subject: [PATCH] merge conflict

---
 .../src/de/samdev/colorrunner/game/world/CRGameWorld.java | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/core/src/de/samdev/colorrunner/game/world/CRGameWorld.java b/core/src/de/samdev/colorrunner/game/world/CRGameWorld.java
index 0b79fa3..e504295 100644
--- a/core/src/de/samdev/colorrunner/game/world/CRGameWorld.java
+++ b/core/src/de/samdev/colorrunner/game/world/CRGameWorld.java
@@ -3,20 +3,12 @@ package de.samdev.colorrunner.game.world;
 import com.badlogic.gdx.Game;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.math.Rectangle;
-
-<<<<<<< .merge_file_a12048
-import de.samdev.colorrunner.CRGame;
-import de.samdev.colorrunner.game.renderer.AbstractGameRenderer;
-=======
 import java.util.ArrayList;
 import java.util.List;
-
->>>>>>> .merge_file_a07400
 import de.samdev.colorrunner.game.world.entities.CRGameEntity;
 import de.samdev.colorrunner.game.world.entities.gameentities.PlayerEntity;
 import de.samdev.colorrunner.game.world.map.provider.MapProvider;
 import de.samdev.colorrunner.input.GameInputListener;
-import de.samdev.colorrunner.screens.menu.MainMenu;
 
 public class CRGameWorld implements GameInputListener {
 	public PlayerEntity player;