From 83d01bd6242a8fd012878761e82042a557acb75f Mon Sep 17 00:00:00 2001
From: Guille Polito <guillermopolito@gmail.com>
Date: Thu, 26 Sep 2019 10:17:53 +0200
Subject: [PATCH] evolving toto

---
 toto | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/toto b/toto
index 3cd68e8..7a51541 100644
--- a/toto
+++ b/toto
@@ -1 +1,2 @@
-Ceci est toto modifié.
\ No newline at end of file
+Ceci est toto modifié.
+This is a change that has a conflict
\ No newline at end of file
-- 
GitLab