From 95e62b72b6c31782acb5e3143f1a990ef244d1e8 Mon Sep 17 00:00:00 2001
From: Simon Bliudze <Simon.Bliudze@inria.fr>
Date: Thu, 3 Oct 2019 11:29:37 +0200
Subject: [PATCH] Trying to creat a conflict

---
 conflict | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conflict b/conflict
index 06da6cb..eeb4d9a 100644
--- a/conflict
+++ b/conflict
@@ -1,3 +1,3 @@
 to create
 a
-conflict
\ No newline at end of file
+conflictSimon
-- 
GitLab