finalize merge

This commit is contained in:
quentin.perret 2022-06-10 17:25:33 +02:00
parent 6899115d94
commit b0fa82b06e

View file

@ -10,15 +10,10 @@ Pqueue getNextE(Pqueue elem);
char * gettabChar(Pqueue elem); char * gettabChar(Pqueue elem);
//Setters //Setters
<<<<<<< HEAD
Pqueue setCharLen(Pqueue elem , int _charLen);
Pqueue setTabChar(Pqueue elem , int _charLen, const char *_tabChar);
=======
void setCharLen(Pqueue elem , int _charLen); void setCharLen(Pqueue elem , int _charLen);
void setTabChar(Pqueue elem , int _charLen , char *_tabChar); void setTabChar(Pqueue elem , int _charLen , char *_tabChar);
void setNextE(Pqueue elem , Pqueue next); void setNextE(Pqueue elem , Pqueue next);
>>>>>>> 2e7253c43c8e65a98686582d853147831016103f
Pqueue addLastQ(Pqueue elem, const char* str, int len); Pqueue addLastQ(Pqueue elem, const char* str, int len);
//Removers //Removers