3010293
/
PR2-Gruppenprojekt
2
0
Fork 0
Code Issues 22 Pull Requests Packages Projects Releases Wiki Activity

fixed merge conflit

main
Berat Kocak 2024-12-22 19:28:46 +01:00
parent fc875a069c
commit b4a7429374
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/HighscoreGUI.java
View File

@ -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 {