From 088e550c8d26cf6363d01d0827ab16cc0dd4899d Mon Sep 17 00:00:00 2001
From: klmp200 <klmp200@klmp200.net>
Date: Sat, 10 Dec 2016 20:54:06 +0100
Subject: [PATCH] Manual merge

---
 LibList/CellElement.c |  2 --
 LibList/CellElement.h | 20 +++-----------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/LibList/CellElement.c b/LibList/CellElement.c
index a9ce164..0ef1521 100644
--- a/LibList/CellElement.c
+++ b/LibList/CellElement.c
@@ -86,7 +86,6 @@ void removeNextCol(cellElement* tree){
 		free(elem);
 		elem = NULL;
 		tree->nextCol = NULL;
-
 	}
 
 }
@@ -99,7 +98,6 @@ void removeNextRow(cellElement* tree){
 		free(elem);
 		elem =NULL;
 		tree->nextRow = NULL;
-
 	}
 
 }
diff --git a/LibList/CellElement.h b/LibList/CellElement.h
index 51597bd..688395f 100644
--- a/LibList/CellElement.h
+++ b/LibList/CellElement.h
@@ -7,15 +7,7 @@
 *@false : 0
 */
 typedef enum Bool{
-<<<<<<< a99b5938634fe0e05047ed6418191cdbc8cb683a:LibList/CellElement.h
-<<<<<<< 0996ce834deca07fbf19d0b5de5f3c8b568185e6:LibList/CellElement.h
 
-=======
-	
->>>>>>> tests et complètion des fx:CellElement.h
-=======
-
->>>>>>> Add true makefile + lists:LibList/CellElement.h
 	true  = 1,
 	false = 0
 
@@ -35,7 +27,7 @@ typedef enum Bool{
 *
 */
 struct cellElement {
-
+	
 	int colIndex;
 	int rowIndex;
 
@@ -53,17 +45,11 @@ void freeCellElem(cellElement * elem);
 int AddNextCol(cellElement* tree);
 int AddNextRow(cellElement* tree);
 
-<<<<<<< 2c81de90ca42fb8c5d2c30e01bf26df7f9292954:LibList/CellElement.h
-void FreeCellElement(cellElement* element);
-=======
 void removeNextCol(cellElement* list);
 void removeNextRow(cellElement* list);
-void recursivePrint(cellElement * tree);
->>>>>>> Added funcs about CellElement:CellElement.h
 
-<<<<<<< a99b5938634fe0e05047ed6418191cdbc8cb683a:LibList/CellElement.h
-=======
+void recursivePrint(cellElement * tree);
+
 void FreeCellElement(cellElement* element);
 
->>>>>>> Add true makefile + lists:LibList/CellElement.h
 #endif