From 192d219f882e01507a4ae0a5b1221d71a299b14e Mon Sep 17 00:00:00 2001
From: samuelsmith <samuelsmith@localhost>
Date: Thu, 17 Apr 2025 10:38:15 +0200
Subject: [PATCH] remove move characters

---
 OOP_2B1_Project/src/backend/Move.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/OOP_2B1_Project/src/backend/Move.java b/OOP_2B1_Project/src/backend/Move.java
index 1893e66..37ca6b8 100644
--- a/OOP_2B1_Project/src/backend/Move.java
+++ b/OOP_2B1_Project/src/backend/Move.java
@@ -7,7 +7,7 @@ public class Move {
  * 
  */
 	
-<<<<<<< HEAD
+
 	
 	
 	
@@ -16,7 +16,5 @@ public class Move {
 	
 //En passant method
 	
-=======
 
->>>>>>> branch 'main' of https://gitarero.ecam.fr/romain.murphy/OOP_2B1_Project.git
 }