From 66404adb55aeba1b845d63d266bcba2690c56027 Mon Sep 17 00:00:00 2001
From: CsellarAndras <andras.csellar@nokia.com>
Date: Mon, 30 Mar 2020 10:50:18 +0200
Subject: [PATCH] Encodeing + removed files
---
.../src/arctic_nightmare/Field.java | 2 +-
.../arctic_nightmare/Main_BACKUP_1591.java | 33 -------------------
.../src/arctic_nightmare/Main_BASE_1591.java | 24 --------------
.../src/arctic_nightmare/Main_LOCAL_1591.java | 29 ----------------
.../arctic_nightmare/Main_REMOTE_1591.java | 24 --------------
5 files changed, 1 insertion(+), 111 deletions(-)
delete mode 100644 Arctic_Nigthmare/src/arctic_nightmare/Main_BACKUP_1591.java
delete mode 100644 Arctic_Nigthmare/src/arctic_nightmare/Main_BASE_1591.java
delete mode 100644 Arctic_Nigthmare/src/arctic_nightmare/Main_LOCAL_1591.java
delete mode 100644 Arctic_Nigthmare/src/arctic_nightmare/Main_REMOTE_1591.java
diff --git a/Arctic_Nigthmare/src/arctic_nightmare/Field.java b/Arctic_Nigthmare/src/arctic_nightmare/Field.java
index 8e751cd..6fbb051 100644
--- a/Arctic_Nigthmare/src/arctic_nightmare/Field.java
+++ b/Arctic_Nigthmare/src/arctic_nightmare/Field.java
@@ -1,4 +1,4 @@
-package arctic_nightmare;
+package arctic_nightmare;
import java.util.ArrayList;
import java.util.List;
diff --git a/Arctic_Nigthmare/src/arctic_nightmare/Main_BACKUP_1591.java b/Arctic_Nigthmare/src/arctic_nightmare/Main_BACKUP_1591.java
deleted file mode 100644
index b724279..0000000
--- a/Arctic_Nigthmare/src/arctic_nightmare/Main_BACKUP_1591.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package arctic_nightmare;
-import java.util.TreeMap;
-import java.io.IOException;
-import java.util.Set;
-import java.util.Iterator;
-import java.util.Map;
-
-
-/**
- *
- * @author(name = "csellar")
- */
-public class Main {
-
- /**
- * @param args the command line arguments
- */
- public static void main(String[] args) throws IOException {
- Game game = new Game();
-<<<<<<< HEAD
- game.newGame();
-
-
-=======
- game.test();
->>>>>>> 03ec9d85a958d8a953e1f3e1306b4667e3f2e8dc
- }
-}
diff --git a/Arctic_Nigthmare/src/arctic_nightmare/Main_BASE_1591.java b/Arctic_Nigthmare/src/arctic_nightmare/Main_BASE_1591.java
deleted file mode 100644
index 2c8df0a..0000000
--- a/Arctic_Nigthmare/src/arctic_nightmare/Main_BASE_1591.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package arctic_nightmare;
-
-import java.io.IOException;
-
-/**
- *
- * @author csellar
- */
-public class Main {
-
- /**
- * @param args the command line arguments
- */
- public static void main(String[] args) throws IOException {
- Game game = new Game();
- game.newGame();
- }
-
-}
diff --git a/Arctic_Nigthmare/src/arctic_nightmare/Main_LOCAL_1591.java b/Arctic_Nigthmare/src/arctic_nightmare/Main_LOCAL_1591.java
deleted file mode 100644
index 69b2eb2..0000000
--- a/Arctic_Nigthmare/src/arctic_nightmare/Main_LOCAL_1591.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package arctic_nightmare;
-import java.util.TreeMap;
-import java.io.IOException;
-import java.util.Set;
-import java.util.Iterator;
-import java.util.Map;
-
-
-/**
- *
- * @author(name = "csellar")
- */
-public class Main {
-
- /**
- * @param args the command line arguments
- */
- public static void main(String[] args) throws IOException {
- Game game = new Game();
- game.newGame();
-
-
- }
-}
diff --git a/Arctic_Nigthmare/src/arctic_nightmare/Main_REMOTE_1591.java b/Arctic_Nigthmare/src/arctic_nightmare/Main_REMOTE_1591.java
deleted file mode 100644
index 03f1d8e..0000000
--- a/Arctic_Nigthmare/src/arctic_nightmare/Main_REMOTE_1591.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package arctic_nightmare;
-
-import java.io.IOException;
-
-/**
- *
- * @author csellar
- */
-public class Main {
-
- /**
- * @param args the command line arguments
- */
- public static void main(String[] args) throws IOException {
- Game game = new Game();
- game.test();
- }
-
-}
--
GitLab