From 925c42ba2c08575339d3b9841cf74ec98b30354c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Gauthier?= <aurelien3075@hotmail.com>
Date: Fri, 10 Jun 2022 17:21:16 +0200
Subject: [PATCH] merge real

---
 Code-C/queue.c | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/Code-C/queue.c b/Code-C/queue.c
index d84614d..8628b4d 100644
--- a/Code-C/queue.c
+++ b/Code-C/queue.c
@@ -23,11 +23,7 @@ typedef struct queue *Pqueue;
  * 
  * @return Pqueue 
  */
-<<<<<<< HEAD
 Pqueue queueCreateEmpty(){
-=======
-Pqueue createE(int lenChar){
->>>>>>> 2e7253c43c8e65a98686582d853147831016103f
     Pqueue new = (Pqueue) malloc(sizeof(struct queue));
     assert(new);
     new->charLen = 0;
@@ -103,7 +99,6 @@ char * queueGetTabChar(Pqueue elem){
     return elem->tabChar;
 }
 
-<<<<<<< HEAD
                                     /************       ************/
 
 /**
@@ -118,18 +113,6 @@ Pqueue queueCreateE(int lenChar, const char* _tabChar){
     queueSetTabChar(new, lenChar, _tabChar);
     new->pNextE = NULL;
     return new;
-=======
-void setCharLen(Pqueue elem , int _charLen){
-    assert(elem);
-    elem->charLen = _charLen;
-}
-
-void setTabChar(Pqueue elem , int _charLen , char *_tabChar){
-    assert(elem);
-    elem->charLen = _charLen;
-    elem->tabChar = (char *) malloc(_charLen * sizeof(char));
-    elem->tabChar = _tabChar;
->>>>>>> 2e7253c43c8e65a98686582d853147831016103f
 }
 
 void setNextE(Pqueue elem , Pqueue next){
@@ -200,18 +183,10 @@ Pqueue queueAddLastQ(Pqueue elem, const char* str, int len){
         previous = tmp;
         tmp = queueGetNextE(tmp);
     }
-<<<<<<< HEAD
     tmp = queueCreateE(len);
     tmp->tabChar = str;
     tmp->charLen = len;
     return tmp;
-=======
-    tmp -> pNextE = createE(len);
-    Pqueue next  = getNextE(tmp);
-    next->tabChar = str;
-    next->charLen = len;
-    return next;
->>>>>>> 2e7253c43c8e65a98686582d853147831016103f
 }
 
 /**