Skip to content

G
gitlab-ce
Commit f0b38d0e authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in README.md 

[ci skip]
parent a3df40be
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
doc/api/README.md
View file @ f0b38d0e
...@@ -36,11 +36,8 @@ following locations: ...@@ -36,11 +36,8 @@ following locations:
- [Jobs](jobs.md) - [Jobs](jobs.md)
- [Keys](keys.md) - [Keys](keys.md)
- [Labels](labels.md) - [Labels](labels.md)
<<<<<<< HEAD
- [License](license.md) - [License](license.md)
=======
- [Markdown](markdown.md) - [Markdown](markdown.md)
>>>>>>> upstream/master
- [Merge Requests](merge_requests.md) - [Merge Requests](merge_requests.md)
- [Merge Request Approvals](merge_request_approvals.md) **[STARTER]** - [Merge Request Approvals](merge_request_approvals.md) **[STARTER]**
- [Project milestones](milestones.md) - [Project milestones](milestones.md)
......
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