Merge remote-tracking branch 'origin/master'
# Conflicts: # src/TicTacToe.java
This commit is contained in:
		
						commit
						3e4456b84e
					
				| 
						 | 
					@ -1,5 +1,6 @@
 | 
				
			||||||
public class TicTacToe {
 | 
					public class TicTacToe {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public static void main(String[] args) {
 | 
					    public static void main(String[] args) {
 | 
				
			||||||
        System.out.println("Test");
 | 
					        System.out.println("Test Andrin");
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue