conflict merge test

john · Mar 28, 2016 · 298fa7d · 298fa7d
1 parent 1dc0297
commit 298fa7d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/model/Player.java b/src/model/Player.java
@@ -4,7 +4,7 @@
 
 public class Player {
 	private ArrayList<Piece> pieces;
-	private String name;
+	private String _name;
 
 	public Player(String name) {
 		this.name = name;