From 3c01579a00871f8db3db83f2d1659696ac63146a Mon Sep 17 00:00:00 2001
From: Maton Elisabeth <mato@insa-20155>
Date: Thu, 20 Oct 2022 15:01:55 +0200
Subject: [PATCH] Essai conflit de merge

---
 .test.c.swp | Bin 0 -> 12288 bytes
 test.c      |   4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 .test.c.swp

diff --git a/.test.c.swp b/.test.c.swp
new file mode 100644
index 0000000000000000000000000000000000000000..af877a82ee1a18a84e407715a2546812705957fb
GIT binary patch
literal 12288
zcmeI%y-LGS6bJBA5u8L(aE>3NO_NHYg9svl2rXzx9kQj#ZIjw0=H_I{U>Dz}FX2P@
z3a&nbH;^t4b?6lMU${Bkufw^&?UJeS@;KIpx=E@X6CK<?2cz$+^~V`e;&WC{|JUNQ
z@VkA(91OPae6JJso@BNV{E#I{nf6!|tOwhVVHE-p*j1q9S$B9ix#^omo$B)9Tsu9P
z?3xwlApijgKmY;|fB*y_0D%?>@LPvgs@}b(=KUsi{={a8009U<00Izz00bZa0SG_<
z0uX>e3kCd;Xmv!iR=xiJzj^=vsPUKTpPRK7-VG%~00Izz00bZa0SG_<0uX=z1X?KI
zxFg%DIEgIJac#$P$DT)Wo-ZRQxXdFVIk7#<CCQasRDxx!zH!MyzD}?6a6Y3r4VGmn
NwA+HiIMbs$`UUMNJ_rB+

literal 0
HcmV?d00001

diff --git a/test.c b/test.c
index 5faca87..1f1d838 100644
--- a/test.c
+++ b/test.c
@@ -1 +1,3 @@
-include <stdio.h>
+TJEQTJOZIETZHETEFNSD<NF;<DFGZEtkzesjfnsf
+include <stdio.htefzefZEEQRTYEQRYEQRYY
+ERTYEQRYTQERYKLJERYERQYOHQEROT