Fix conflict in doc/api/namespaces.md

9ac4e26a · Tomasz Maczukin · caab4e03 · 9ac4e26a
Commit 9ac4e26a authored Feb 15, 2018 by Tomasz Maczukin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

doc/api/namespaces.md doc/api/namespaces.md +0 -4

No files found.
--- a/doc/api/namespaces.md
+++ b/doc/api/namespaces.md
@@ -40,12 +40,8 @@ Example response:
    "kind": "group"
    "full_path": "group1",
    "parent_id": null,
-<<<<<<< HEAD
    "members_count_with_descendants": 2,
    "plan": "bronze"
-=======
-    "members_count_with_descendants": 2
->>>>>>> upstream/master
  },
  {
    "id": 3,