From f40777c3d3ba941c49e50255b9d68b73145c26e4 Mon Sep 17 00:00:00 2001
From: pettersr <pettersr@stud.ntnu.no>
Date: Tue, 30 Mar 2021 00:47:44 +0200
Subject: [PATCH] merge fix

---
 .../src/com/mygdx/game/controllers/NetworkController.java     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/CheckersClient/core/src/com/mygdx/game/controllers/NetworkController.java b/CheckersClient/core/src/com/mygdx/game/controllers/NetworkController.java
index 49e8f91..36dfee0 100644
--- a/CheckersClient/core/src/com/mygdx/game/controllers/NetworkController.java
+++ b/CheckersClient/core/src/com/mygdx/game/controllers/NetworkController.java
@@ -3,12 +3,10 @@ package com.mygdx.game.controllers;
 import com.badlogic.gdx.utils.Queue;
 import com.esotericsoftware.kryo.Kryo;
 import com.esotericsoftware.kryonet.Client;
-<<<<<<< HEAD
 import com.esotericsoftware.kryonet.Server;
 import com.mygdx.game.UniCheckersClient;
-=======
 import com.mygdx.game.controllers.commands.Command;
->>>>>>> origin/master
+
 
 import java.io.IOException;
 
-- 
GitLab