From 6bf5f8b6598862921a707b0156e09b0993f5e9f2 Mon Sep 17 00:00:00 2001
From: g le-chartier <g.le-chartier@ecam.fr>
Date: Wed, 29 May 2024 11:45:15 +0200
Subject: [PATCH] fixed merge issues

---
 src/backend/Simulator.java | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/backend/Simulator.java b/src/backend/Simulator.java
index 451ccef..becd2f7 100644
--- a/src/backend/Simulator.java
+++ b/src/backend/Simulator.java
@@ -4,21 +4,7 @@ import java.awt.Color;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
-import java.awt.Color;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
 import java.util.ArrayList;
-import java.util.List;
-import java.util.Scanner;
-
-//import for json
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-import java.util.List;
-import java.util.Scanner;
 
 //import for json
 import org.json.simple.JSONArray;
@@ -96,9 +82,6 @@ public class Simulator extends Thread {
 		//TODO-COMPLETE : replace with proper return
 		return this.height;
 	}
-	public ArrayList<ArrayList<Integer>> getColorArrayList() {
-		return colorArrayList;
-	}
 
 	public ArrayList<ArrayList<Integer>> getColorArrayList(){
 		return colorArrayList;