testing merging

john · Mar 28, 2016 · d315412 · d315412
1 parent 4a8bb69
commit d315412
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/model/Player.java b/src/model/Player.java
@@ -4,10 +4,10 @@
 
 public class Player {
 	private ArrayList<Piece> pieces;
-	private String name;
+	private String name_;
 
 	public Player(String name) {
-		this.name = name;
+		this.name_ = name;
 		this.pieces = new ArrayList<Piece>();
 	}
 
@@ -20,10 +20,10 @@ public ArrayList<Piece> getPieces() {
 	}
 
 	public String getName() {
-		return name;
+		return name_;
 	}
 
 	public void setName(String name) {
-		this.name = name;
+		this.name_ = name;
 	}
 }