From 15dab1e2b216c70c296840fbf16efc309c9504cf Mon Sep 17 00:00:00 2001
From: 3010293 <3010293@stud.hs-mannheim.de>
Date: Sun, 22 Dec 2024 19:41:58 +0100
Subject: [PATCH] fixed merge conf

---
 PR2Projekt/pom.xml                                     |  4 ----
 .../informatik/mvn/domain/LogHighscores.java           |  6 +-----
 .../de/hs_mannheim/informatik/mvn/gui/GameGUI.java     | 10 ----------
 .../de/hs_mannheim/informatik/mvn/gui/MenuGUI.java     |  8 --------
 .../de/hs_mannheim/informatik/mvn/test/HitoriTest.java |  6 ------
 5 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/PR2Projekt/pom.xml b/PR2Projekt/pom.xml
index 76a50a0..fd43d06 100644
--- a/PR2Projekt/pom.xml
+++ b/PR2Projekt/pom.xml
@@ -61,11 +61,7 @@
 <configuration>
 <transformers>
 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-<<<<<<< HEAD
 <mainClass>src.main.java</mainClass>
-=======
-<mainClass>src.main.java.de.hs_mannheim.informatik.mvn.domain.HitoriMain</mainClass>
->>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
 </transformer>
 </transformers>
 </configuration>
diff --git a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/domain/LogHighscores.java b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/domain/LogHighscores.java
index 1613202..2633ef9 100644
--- a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/domain/LogHighscores.java
+++ b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/domain/LogHighscores.java
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 package de.hs_mannheim.informatik.mvn.domain; 
-=======
-package src.main.java.de.hs_mannheim.informatik.mvn.domain; 
->>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
 
 import java.io.BufferedWriter;
 import java.io.FileNotFoundException;
@@ -30,7 +26,7 @@ public class LogHighscores {
             sc.nextLine();
         }
         sc.close();
-
+        
         try (BufferedWriter writer = new BufferedWriter(new FileWriter(filepath, true))) {
             String eintrag = timePart + " " + username;
             logger.info("Neuer Eintrag: {}", eintrag);
diff --git a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/GameGUI.java b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/GameGUI.java
index 69af5b6..ba5b5bb 100644
--- a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/GameGUI.java
+++ b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/GameGUI.java
@@ -1,9 +1,4 @@
-<<<<<<< HEAD
 package de.hs_mannheim.informatik.mvn.gui;
-=======
-package src.test.java.de.hs_mannheim.informatik.mvn.gui; 
->>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
-
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Color;
@@ -23,12 +18,7 @@ import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
 
-<<<<<<< HEAD
 import de.hs_mannheim.informatik.mvn.domain.*;
-=======
-import src.main.java.de.hs_mannheim.informatik.mvn.domain.HitoriMain;
-import src.main.java.de.hs_mannheim.informatik.mvn.domain.LogHighscores;
->>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
 
 public class GameGUI extends JFrame implements ActionListener {
 	
diff --git a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/MenuGUI.java b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/MenuGUI.java
index 978272f..12b4bcc 100644
--- a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/MenuGUI.java
+++ b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/MenuGUI.java
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 package de.hs_mannheim.informatik.mvn.gui;
-=======
-package src.test.java.de.hs_mannheim.informatik.mvn.gui; 
->>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
 
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
@@ -17,11 +13,7 @@ import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-<<<<<<< HEAD
 import de.hs_mannheim.informatik.mvn.domain.*;
-=======
-import src.main.java.de.hs_mannheim.informatik.mvn.domain.HitoriMain;
->>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
 
 public class MenuGUI extends JFrame implements ActionListener {
 	
diff --git a/PR2Projekt/src/test/java/java/de/hs_mannheim/informatik/mvn/test/HitoriTest.java b/PR2Projekt/src/test/java/java/de/hs_mannheim/informatik/mvn/test/HitoriTest.java
index e89aca6..67c97a2 100644
--- a/PR2Projekt/src/test/java/java/de/hs_mannheim/informatik/mvn/test/HitoriTest.java
+++ b/PR2Projekt/src/test/java/java/de/hs_mannheim/informatik/mvn/test/HitoriTest.java
@@ -1,18 +1,12 @@
-<<<<<<< HEAD
 package java.de.hs_mannheim.informatik.mvn.test;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 import de.hs_mannheim.informatik.mvn.domain.HitoriMain2;
 import de.hs_mannheim.informatik.mvn.gui.GameGUI;
-=======
-package src.test.java.de.hs_mannheim.informatik.mvn.test;
 
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
-import src.java.main.de.hs_mannheim.informatik.domain.HitoriMain;
-import src.java.main.de.hs_mannheim.informatik.gui.GameGUI;
->>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
 import java.io.FileNotFoundException;
 import java.util.Arrays;