Permalink
Browse files

fixed merge fail

  • Loading branch information...
1 parent a7fb9d3 commit 5ec3af8741e4a0d652cfba1a1bbf1bca63f376f9 Vegar Engen committed Mar 13, 2012
Showing with 1 addition and 16 deletions.
  1. +0 −15 GoldMine/res/values/color.xml.orig
  2. +1 −1 GoldMine/src/no/ntnu/tdt4240/views/GridView.java
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <color name="background">#000000</color>
-<<<<<<< HEAD
- <color name="gold">#EAC117</color>
- <color name="mine">#747170</color>
- <color name="blank">#ADDFFF</color>
-=======
- <color name="player1_background">#ff0000</color>
- <color name="player2_background">#00ff00</color>
- <color name="gold">#DDDDDD</color>
- <color name="mine">#CCCCCC</color>
- <color name="blank">#AAAAAA</color>
->>>>>>> 7db98b4fc8b0e676003f3acab9eccdd422e4aa36
-</resources>
@@ -17,7 +17,7 @@
public GridView(Context context) {
super(context);
- gameboard = GameBoard.getGameBoard();
+// gameboard = GameBoard.getGameBoard();
}
protected void onDraw(Canvas canvas) {

0 comments on commit 5ec3af8

Please sign in to comment.