Fixed doc conflict

3faf8511 · Jan Provaznik · 730149d8 · 3faf8511
Commit 3faf8511 authored Sep 07, 2018 by Jan Provaznik
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/doc/api/resource_label_events.md
+++ b/doc/api/resource_label_events.md
@@ -88,7 +88,6 @@ Parameters:
 curl --request GET --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/projects/5/issues/11/resource_label_events/1
 ```

-<<<<<<< HEAD
 ## Epics

 ### List group epic label events
@@ -175,8 +174,6 @@ Parameters:
 curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/groups/1/epics/11/resource_label_events/107
 ```

-=======
->>>>>>> upstream/master
 ## Merge requests

 ### List project merge request label events