Skip to content

G
gitlab-ce
Commit 3faf8511 authored by Jan Provaznik's avatar Jan Provaznik
Browse files
Options

Fixed doc conflict

parent 730149d8
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
doc/api/resource_label_events.md
View file @ 3faf8511
...@@ -88,7 +88,6 @@ Parameters: ...@@ -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 curl --request GET --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/projects/5/issues/11/resource_label_events/1
``` ```
<<<<<<< HEAD
## Epics ## Epics
### List group epic label events ### List group epic label events
...@@ -175,8 +174,6 @@ Parameters: ...@@ -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 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 ## Merge requests
### List project merge request label events ### List project merge request label events
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7