From 33a439646d02a3e6701ba6d26934d750989abc89 Mon Sep 17 00:00:00 2001
From: klmp200 <klmp200@klmp200.net>
Date: Sat, 10 Dec 2016 21:17:26 +0100
Subject: [PATCH] In the head

---
 LibList/CellElement.c | 45 -------------------------------------------
 LibList/CellElement.h | 13 -------------
 2 files changed, 58 deletions(-)

diff --git a/LibList/CellElement.c b/LibList/CellElement.c
index d974d4f..cc73a6f 100644
--- a/LibList/CellElement.c
+++ b/LibList/CellElement.c
@@ -1,33 +1,15 @@
-<<<<<<< HEAD
-/*
-* @Author: klmp200
-* @Date:   2016-12-10 01:32:50
-* @Last Modified by:   klmp200
-* @Last Modified time: 2016-12-10 21:08:25
-*/
-=======
 /***
 --- CellElemFunc ---
 ---Created by : Naej Doree ---
 ***/
->>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <CellElement.h>
 
-<<<<<<< HEAD
 cellElement * CreateCellElem(){
 	cellElement * elem = NULL;
 	elem = (cellElement*) malloc(sizeof(cellElement));
-	
-=======
-
-cellElement * CreateCellElem(){
-	cellElement * elem = NULL;
-	elem = (cellElement*) malloc(sizeof(cellElement));
-
->>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
 	if (elem == NULL){
 		return NULL;
 	}
@@ -38,13 +20,7 @@ cellElement * CreateCellElem(){
 	elem->nextCol = NULL;
 	elem->nextRow = NULL;
 
-<<<<<<< HEAD
-	
-	return elem;	
-=======
-
 	return elem;
->>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
 }
 
 void freeCellElem(cellElement * elem){
@@ -56,11 +32,7 @@ int AddNextCol(cellElement* tree){
 
 	cellElement * elem = NULL;
 	elem = (cellElement*) malloc(sizeof(cellElement));
-<<<<<<< HEAD
-	
-=======
 
->>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
 	if (elem == NULL){
 		return -1;
 	}
@@ -76,11 +48,6 @@ int AddNextCol(cellElement* tree){
 	}else{
 		return -2;
 	}
-<<<<<<< HEAD
-	
-=======
-
->>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
 	return 1;
 }
 
@@ -89,11 +56,7 @@ int AddNextRow(cellElement* tree){
 
 	cellElement * elem = NULL;
 	elem = (cellElement*) malloc(sizeof(cellElement));
-<<<<<<< HEAD
-	
-=======
 
->>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
 	if (elem == NULL){
 		return -1;
 	}
@@ -119,10 +82,6 @@ void removeNextCol(cellElement* tree){
 		free(elem);
 		elem = NULL;
 		tree->nextCol = NULL;
-<<<<<<< HEAD
-	
-=======
->>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
 	}
 
 }
@@ -135,10 +94,6 @@ void removeNextRow(cellElement* tree){
 		free(elem);
 		elem =NULL;
 		tree->nextRow = NULL;
-<<<<<<< HEAD
-	
-=======
->>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
 	}
 
 }
diff --git a/LibList/CellElement.h b/LibList/CellElement.h
index d1cfec6..7a603b5 100644
--- a/LibList/CellElement.h
+++ b/LibList/CellElement.h
@@ -38,7 +38,6 @@ struct cellElement {
 
 };
 typedef struct cellElement cellElement;
-<<<<<<< HEAD
 
 cellElement * CreateCellElem();
 void freeCellElem(cellElement * elem);
@@ -49,18 +48,6 @@ int AddNextRow(cellElement* tree);
 void removeNextCol(cellElement* list);
 void removeNextRow(cellElement* list);
 
-=======
-
-cellElement * CreateCellElem();
-void freeCellElem(cellElement * elem);
-
-int AddNextCol(cellElement* tree);
-int AddNextRow(cellElement* tree);
-
-void removeNextCol(cellElement* list);
-void removeNextRow(cellElement* list);
-
->>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
 void recursivePrint(cellElement * tree);
 
 void FreeCellElement(cellElement* element);