From 2316669f2f554e0bc19c969e8cde3679165f3e47 Mon Sep 17 00:00:00 2001 From: Guille Polito <guillermopolito@gmail.com> Date: Thu, 19 Sep 2019 11:48:38 +0200 Subject: [PATCH] toto conflict --- toto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toto b/toto index 7f8c62b..c4deb09 100644 --- a/toto +++ b/toto @@ -1 +1 @@ -Ceci est toto \ No newline at end of file +Ceci est toto modifié depuis le deuxieme \ No newline at end of file -- GitLab