Resolve conflict

4 years ago · 79dce381b5
parent be4b4c347e
commit 79dce381b5
1 changed files with 2 additions and 7 deletions
--- a/Pontu/src/model/Game.c
+++ b/Pontu/src/model/Game.c
@ -123,30 +123,25 @@ bool cliqueOnBoard(const Coord coord, Game* game) {
 		}
 		break;
 	case RM_BRIDGE:
-<<<<<<< HEAD
-		
-		
 		break;
-=======
 		/*if (islandOrBridge.type == )
 			rmBridge
 			if (isIslandIsolated()) {
 				
 			}
 		break;*/
->>>>>>> cacb66ccf9c68400e71a998e9349c7dce919383f
 	default:
 		break;
 	}
 }

 bool moveOnBoard(const Coord start, const Coord end, Game* game) {
-	const IslandOrBridge islandOrBridge = coordToEntity(coord);
+	/* const IslandOrBridge islandOrBridge = coordToEntity(coord);

 	switch(game->phase)
 	{
 		case 
-	}
+	}*/
 }

 bool rmBridge(Bridge bridge, Board* board) {