From 008903f13610fd6b251f66e60d1c13a75990088b Mon Sep 17 00:00:00 2001
From: "wang.gao" <wang.gao@utc.fr>
Date: Thu, 4 Jul 2019 15:19:11 +0200
Subject: [PATCH] post conflit solved

---
 dev.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev.txt b/dev.txt
index 02b6c95..9e6bcc0 100644
--- a/dev.txt
+++ b/dev.txt
@@ -1,2 +1,3 @@
 Ma première ligne
 Titi
+new line after merge with conflit
-- 
GitLab