From 32ce167fe9debd1b51766f40284592884072124e Mon Sep 17 00:00:00 2001
From: cleme <cleme@172.30.57.224>
Date: Thu, 10 Apr 2025 11:35:18 +0200
Subject: [PATCH] push connerie romain

---
 OOP_1A2_Project/src/backend/Board.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/OOP_1A2_Project/src/backend/Board.java b/OOP_1A2_Project/src/backend/Board.java
index 911c076..48e890f 100644
--- a/OOP_1A2_Project/src/backend/Board.java
+++ b/OOP_1A2_Project/src/backend/Board.java
@@ -34,10 +34,7 @@ public class Board {
         return isWhiteTurn;
     }
 
-	public void setPiece(boolean isWhite, PieceType type, int x, int y) {
-<<<<<<< HEAD
-		//TODO
-=======
+	public void setPiece(boolean isWhite, PieceType type, int x, int y) {
 		for (int i = 0; i < pieces.size(); i++) {
 			Piece p = pieces.get(i);
 		    if (p.getX() == x && p.getY() == y) {
@@ -46,8 +43,7 @@ public class Board {
 		    }
 		}
 		Piece newPiece = new Piece( x, y, type,isWhite);
-	    pieces.add(newPiece);
->>>>>>> branch 'master' of https://gitarero.ecam.fr/celestin.bellanger/OOP_Groupe1A2_Project
+	    pieces.add(newPiece);
 	}
 
 	public void populateBoard() {