From ff3ea329662edde1433bd7be3690895247470794 Mon Sep 17 00:00:00 2001
From: Taha Belkhiri <belkhiri.taha53@gmail.com>
Date: Tue, 21 Jun 2022 10:42:19 +0200
Subject: [PATCH] Merge

---
 travail_individuel/Belkhiri/GameOfLife/run    | Bin 23432 -> 0 bytes
 .../Belkhiri/GameOfLife/src/map.c             |  25 ------------------
 .../Belkhiri/GameOfLife/src/map.h             |  14 ----------
 3 files changed, 39 deletions(-)
 delete mode 100755 travail_individuel/Belkhiri/GameOfLife/run

diff --git a/travail_individuel/Belkhiri/GameOfLife/run b/travail_individuel/Belkhiri/GameOfLife/run
deleted file mode 100755
index 5091a0fc6309b406237ba71628156f6fa53f0452..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23432
zcmeHPdw7)9nLm>-5EL>&phc`QDpaU41O&xPGzkoRX%mQC*2{{+keMW-lbJaAhKrSp
zhFGU#D0XeD)^_n}yRt1-+N~Dv6I2qm*e6)9*{W@7u}%nTOtA(Rnf<-z^5vT^^P#)X
zKKsw+<jK6}{k@lSf4?(lX3l1B<)S=?gQ=9yu3^M=j~7U(6m%??8IV#opN+-q6m}jP
z34R2}guGM`NJZ+(%ccbq&j%&DNtDS!za(I$sH!1Rva?NvQle;);K|NOS;<@J;V%k3
zMU~truUN>Lg-+*A8B^43M}70))xz$<%4~W}w!8BT=~vc^x{K^~O1quXPSIl7pNgvf
zq&}hl`O>eIx*?<F=C6!d?QW2ER=QB?D@tWhTK<k6_@9(lE$s?s3qMwRNWe@{Ro->5
zqkj3kNe%NdS)ScE)XR1&O5;swRyefgvbnRuftle@B))#;`uUg5ylk$gDe9TS<y0>!
zgNA?cl9dd@k|IpH<6|*F@+3c(-En!>zj}AS@S}hF#kTYI-oE+r`Y$OTR3_<AB6~T+
z27du^q(kk$xAaj5oKGig8vZGjdk-J$4F0y^*}r`I&RaJ>eCL1MeuG*zLc#QU7xHJB
zc$F<gp}Fw+C^#2>%*M|hHu^8y=vUb2-)@8d+6J$)@&88~{AV`!dK>(D8~hxb`ebbI
zi*4|38~jO|au3_+ciP}5Z17Vy{y((QA89jB9<cE<)<*vg8~^9Sj~oBi^g|o{sW$#;
z&bqBmz?azIm%&dFJDY8-&Ni9|{DN$Va}`{FGOMSFVM?=sp9N2c&Jo}hQdT1Mt^OI}
z%<_emb7s!*6jO95W<FnCLp0)R()}^r=VQK#6;-}KFcz!}HR-|FimC<SXe7A8za|_M
zvYZmQ^eu`7gUjQwT7OND5r17g7~8NSxL%LP1W*wP>0GiP7WC`EWx)uQ6XVeGpf31@
zG5@*+(Qs723xi?*2Cg8a3!;sJT^!UG#AC5wL|+(cYJ^f%G$2Z;j)ueDwGf!hs$;<>
zg^0psy%xoy4dyz_Qo=#MC?CbF2-V!yWUBV{p-3RQ&g6ViC>&lEtkG51`gFZ^uzOdm
zSmfgkr_9pEU}RAgRg<IO3pM!bf`iHxRf~O<QGbBsje0%0DIf+(GQJw#b0n@I!DTGC
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
Hg=PN*D}<}}

diff --git a/travail_individuel/Belkhiri/GameOfLife/src/map.c b/travail_individuel/Belkhiri/GameOfLife/src/map.c
index 5392bec..30a49ee 100644
--- a/travail_individuel/Belkhiri/GameOfLife/src/map.c
+++ b/travail_individuel/Belkhiri/GameOfLife/src/map.c
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #include "map.h"
 
 
@@ -33,28 +32,4 @@ void writeMap(int map[MAPSIZE][MAPSIZE], char* filename){
         fprintf(f, "\n");
     }
     fclose(f);
-=======
-#include "map.h"
-
-
-int map[MAPSIZE][MAPSIZE];
-
-
-void initMap(int map[MAPSIZE][MAPSIZE]) {
-    for(int i = 0; i < MAPSIZE; i++){
-        for(int j = 0; j < MAPSIZE; j++){
-            map[i][j] = rand() % 2;
-        }
-    }
-}
-
-
-void printMap(int map[MAPSIZE][MAPSIZE]){
-    for(int i = 0; i < MAPSIZE; i++){
-        for(int j = 0; j < MAPSIZE; j++){
-            printf("%d ", map[i][j]);
-        }
-        printf("\n");
-    }
->>>>>>> 0a3e97f21219b823cdb1f8f8e7efee9633cdcc07
 }
\ No newline at end of file
diff --git a/travail_individuel/Belkhiri/GameOfLife/src/map.h b/travail_individuel/Belkhiri/GameOfLife/src/map.h
index 5394f62..b50040c 100644
--- a/travail_individuel/Belkhiri/GameOfLife/src/map.h
+++ b/travail_individuel/Belkhiri/GameOfLife/src/map.h
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #ifndef _MAP_HEADER_
 #define _MAP_HEADER_
 
@@ -11,17 +10,4 @@ void printMap(int map[MAPSIZE][MAPSIZE]);
 void initMap(int map[MAPSIZE][MAPSIZE]);
 void writeMap(int map[MAPSIZE][MAPSIZE], char* filename);
 
-=======
-#ifndef _MAP_HEADER_
-#define _MAP_HEADER_
-
-#include "main.h"
-
-#define MAPSIZE 20
-extern int map[MAPSIZE][MAPSIZE];
-
-void printMap(int map[MAPSIZE][MAPSIZE]);
-void initMap(int map[MAPSIZE][MAPSIZE]);
-
->>>>>>> 0a3e97f21219b823cdb1f8f8e7efee9633cdcc07
 #endif
\ No newline at end of file
-- 
GitLab