From c3efbc0d14368e487a60fd2ecf59e5a93d01e4de Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Wed, 8 Feb 2017 17:05:38 +0100 Subject: [PATCH] edited first page so that i can test merge conflict --- first-page.md | 1 + 1 file changed, 1 insertion(+) diff --git a/first-page.md b/first-page.md index 66fbef0..f395f52 100644 --- a/first-page.md +++ b/first-page.md @@ -7,3 +7,4 @@ but will we be able to use the desktop editor with out the online gitbook servic ok i can push to gogs with gitbook, good! but what if i push a commit from else where, how gitbook will resolve that ? +here is what would cause a conflict hehe.