Commit b700da19 authored by Nick Thomas's avatar Nick Thomas

Fix doc merge conflicts

parent 859b693f
......@@ -4,23 +4,13 @@ entry.
## 9.3.3 (2017-06-30)
<<<<<<< HEAD
- No changes.
- Fix head pipeline stored in merge request for external pipelines. !12478
- Bring back branches badge to main project page. !12548
- Fix diff of requirements.txt file by not matching newlines as part of package names.
- Fixed issue boards closed list not showing all closed issues.
- Fixed multi-line markdown tooltip buttons in issue edit form.
- Fix shared runners minutes query to update only projects with used allowance.
- Perform housekeeping only when an import of a fresh project is completed.
=======
- Fix head pipeline stored in merge request for external pipelines. !12478
- Bring back branches badge to main project page. !12548
- Fix diff of requirements.txt file by not matching newlines as part of package names.
- Perform housekeeping only when an import of a fresh project is completed.
- Fixed issue boards closed list not showing all closed issues.
- Fixed multi-line markdown tooltip buttons in issue edit form.
>>>>>>> ce/master
## 9.3.2 (2017-06-27)
......
......@@ -35,18 +35,11 @@ Example response:
{
"id": 2,
"path": "group1",
<<<<<<< HEAD
"kind": "group"
"full_path": "group1",
"parent_id": "null",
"members_count_with_descendants": 2,
"plan": "bronze"
=======
"kind": "group",
"full_path": "group1",
"parent_id": "null",
"members_count_with_descendants": 2
>>>>>>> ce/master
},
{
"id": 3,
......@@ -59,11 +52,7 @@ Example response:
]
```
<<<<<<< HEAD
**Note**: `members_count_with_descendants` and `plan` are presented only for group masters/owners.
=======
**Note**: `members_count_with_descendants` are presented only for group masters/owners.
>>>>>>> ce/master
## Search for namespace
......
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