correction bug

Tetris/app/src/main/java/modele/DashBoard.kt

@@ -217,8 +217,6 @@ class DashBoard(private val width: Int,private val height: Int,private val view:
 
     // Write the shape in gridOfGame
     private fun writeShape(shape: Shape){
-        println("Final X : "+shape.position.x)
-        println("Final Y : "+shape.position.y)
 
         for (line in 0..3) {
             for (column in 0..3) {

Tetris/app/src/main/java/modele/Shape.kt

@@ -54,7 +54,6 @@ class Shape(val typeShape: TypeShape,var position: Position) {
 
         return sharePosition
     }
-<<<<<<< HEAD
 
     fun sharePositionUp(shape: Shape): MutableList<Position> {
         val sharePosition = mutableListOf<Position>()
@@ -70,9 +69,9 @@ class Shape(val typeShape: TypeShape,var position: Position) {
                 }
             }
         }
-
         return sharePosition
-=======
+    }
+
 
     fun sharePositionRotationRight(shape: Shape):Array<IntArray>{
         var leftmostCol = 4
@@ -133,6 +132,5 @@ class Shape(val typeShape: TypeShape,var position: Position) {
             }
         }
         return rotatedMatrix
->>>>>>> Enzo
     }
 }