From be817a9c8feaecfa2e16fe35baf90938a1569df7 Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Wed, 8 Feb 2017 17:08:40 +0100 Subject: [PATCH] Updates first-page.md Auto commit by GitBook Editor --- first-page.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/first-page.md b/first-page.md index eb9d075..0e2902d 100644 --- a/first-page.md +++ b/first-page.md @@ -13,3 +13,5 @@ and what about conflicts ? here is what would cause a conflict hehe. +ok well done, gitbook is able to resolve conflicts! +