Skip to content

G
gitlab-ce
Commit 9ac4e26a authored by Tomasz Maczukin's avatar Tomasz Maczukin
Browse files
Options

Fix conflict in doc/api/namespaces.md

parent caab4e03
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
doc/api/namespaces.md
View file @ 9ac4e26a
...@@ -40,12 +40,8 @@ Example response: ...@@ -40,12 +40,8 @@ Example response:
"kind": "group" "kind": "group"
"full_path": "group1", "full_path": "group1",
"parent_id": null, "parent_id": null,
<<<<<<< HEAD
"members_count_with_descendants": 2, "members_count_with_descendants": 2,
"plan": "bronze" "plan": "bronze"
=======
"members_count_with_descendants": 2
>>>>>>> upstream/master
}, },
{ {
"id": 3, "id": 3,
......
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