edited first page so that i can test merge conflict

2017-02-08 17:05:38 +01:00
parent 44bb3502a3
commit c3efbc0d14
1 changed files with 1 additions and 0 deletions
@@ -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.