Resolve an easy doc conflict

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve an easy doc conflict
Signed-off-by: Rémy Coutable <remy@rymai.me>
5dd836e0 · Rémy Coutable · b8fba958 · 5dd836e0
Commit 5dd836e0 authored May 19, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

doc/api/projects.md doc/api/projects.md +0 -4

No files found.
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
 # Projects API
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/master

 ### Project visibility level