diff --git a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/HighscoreGUI.java b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/HighscoreGUI.java index f52e844..e796613 100644 --- a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/HighscoreGUI.java +++ b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/HighscoreGUI.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; @@ -20,11 +16,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 HighscoreGUI extends JFrame implements ActionListener {