removed merge headers from Matrix

src/main/java/uta/cse3310/Matrix.java

@@ -28,16 +28,6 @@ public class Matrix {
 
   //testing
   public ArrayList<Character> fillerCharactersUsed = new ArrayList<Character>();
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-
->>>>>>> eee088b031a139329acbace8750ae733f277fea4
-=======
-
-=======
->>>>>>> ea35d09 (Update)
->>>>>>> 415fabb (Update)
 
   //non-default constructor
   Matrix(String filename){

src/test/java/uta/cse3310/LobbyTest.java

@@ -65,31 +65,6 @@ public void testUpdateGamesAvailable() {
         assertEquals(2, lobby.gamesAvailable); // Only two games are open
     }
 
-<<<<<<< HEAD
-    public void testlobbylist(){
-        int anyplayer = 0;
-        ArrayList<Player> players = new ArrayList<>();
-        WebSocket socket1 = Mockito.mock(WebSocket.class);
-        WebSocket socket2 = Mockito.mock(WebSocket.class);
-        WebSocket socket3 = Mockito.mock(WebSocket.class);
-        Player player1 = new Player("Alice", socket1);
-        Player player2 = new Player("Bob", socket2);
-        Player player3 = new Player("Mike", socket3);
-        players.add(player1);
-        players.add(player2);
-        players.add(player3);
-        player1.isReady = false;
-        player2.isReady = true;
-        player3.isReady = true; 
-        Lobby lobby = new Lobby(players);  
-        assertEquals(3, lobby.numPlayers);
-        for(int i = 0; i < lobby.numPlayers; i++){
-            if(lobby.playerStatuses.get(i) == true || lobby.playerStatuses.get(i) == false){
-                anyplayer++;
-            }
-        }
-        assertEquals(3, anyplayer);       
-=======
     private Lobby lobby;
     private Player player1;
     private Player player2;
@@ -121,7 +96,6 @@ public void testPlayerStatusChangesInLobbyAfterJoiningGame() {
         // Verify player status in lobby after joining game
         lobby.updateLobby(game.players);
         assertFalse("Player should not be ready in the lobby after joining a game", lobby.playerStatuses.get(0));
->>>>>>> 557afd4 (Update)
     }
 
 }