From 427c40d36f9567bd4aba1180d6be76c646150559 Mon Sep 17 00:00:00 2001
From: Julien Delplanque <julien.delplanque@live.be>
Date: Thu, 3 Oct 2019 11:29:23 +0200
Subject: [PATCH] Des cnflits,:

---
 conflict | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/conflict b/conflict
index 06da6cb..20878d1 100644
--- a/conflict
+++ b/conflict
@@ -1,3 +1,5 @@
 to create
+Des conflits, des conflits.
 a
-conflict
\ No newline at end of file
+conflict
+Des conflits ici aussi.
-- 
GitLab