Resolve conflict in README.md

[ci skip]

Resolve conflict in README.md
[ci skip]
f0b38d0e · Rémy Coutable · a3df40be · f0b38d0e
Commit f0b38d0e authored May 18, 2018 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

doc/api/README.md doc/api/README.md +0 -3

No files found.
--- a/doc/api/README.md
+++ b/doc/api/README.md
@@ -36,11 +36,8 @@ following locations:
 - [Jobs](jobs.md)
 - [Keys](keys.md)
 - [Labels](labels.md)
-<<<<<<< HEAD
 - [License](license.md)
-=======
 - [Markdown](markdown.md)
->>>>>>> upstream/master
 - [Merge Requests](merge_requests.md)
 - [Merge Request Approvals](merge_request_approvals.md) **[STARTER]**
 - [Project milestones](milestones.md)