mirror of
https://gitlab.com/klmp200/LO27.git
synced 2024-11-05 10:38:04 +00:00
Manual merge
This commit is contained in:
parent
1acfbfdee3
commit
088e550c8d
@ -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;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user