Resolve conflicts in doc/api/merge_requests.md

17255af2 · Mark Chao · 29a52bf5 · 17255af2
Commit 17255af2 authored May 21, 2018 by Mark Chao
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -1489,10 +1489,7 @@ Example response:
 [ce-14016]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14016
 [ce-15454]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15454
 [ce-18935]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18935
-<<<<<<< HEAD

 ## Approvals

 For approvals, please see [Merge Request Approvals](merge_request_approvals.md)
-=======
->>>>>>> upstream/master