Resolve conflict in doc/api/projects.md

Signed-off-by: Rémy Coutable <remy@rymai.me>

doc/api/projects.md

@@ -124,11 +124,8 @@ GET /projects
     "only_allow_merge_if_pipeline_succeeds": false,
     "only_allow_merge_if_all_discussions_are_resolved": false,
     "request_access_enabled": false,
-<<<<<<< HEAD
-    "approvals_before_merge": 0,
-=======
->>>>>>> upstream/master
     "merge_method": "merge",
+    "approvals_before_merge": 0,
     "statistics": {
       "commit_count": 37,
       "storage_size": 1038090,
@@ -208,11 +205,8 @@ GET /projects
     "only_allow_merge_if_pipeline_succeeds": false,
     "only_allow_merge_if_all_discussions_are_resolved": false,
     "request_access_enabled": false,
-<<<<<<< HEAD
-    "approvals_before_merge": 0,
-=======
->>>>>>> upstream/master
     "merge_method": "merge",
+    "approvals_before_merge": 0,
     "statistics": {
       "commit_count": 12,
       "storage_size": 2066080,
@@ -510,11 +504,8 @@ GET /projects/:id
   "only_allow_merge_if_all_discussions_are_resolved": false,
   "printing_merge_requests_link_enabled": true,
   "request_access_enabled": false,
-<<<<<<< HEAD
-  "approvals_before_merge": 0,
-=======
->>>>>>> upstream/master
   "merge_method": "merge",
+  "approvals_before_merge": 0,
   "statistics": {
     "commit_count": 37,
     "storage_size": 1038090,
@@ -1509,4 +1500,4 @@ Read more in the [Project Badges](project_badges.md) documentation.
 
 ## Issue and merge request description templates
 
-The non-default [issue and merge request description templates](../user/project/description_templates.md) are managed inside the project's repository. So you can manage them via the API through the [Repositories API](repositories.md) and the [Repository Files API](repository_files.md).
\ No newline at end of file
+The non-default [issue and merge request description templates](../user/project/description_templates.md) are managed inside the project's repository. So you can manage them via the API through the [Repositories API](repositories.md) and the [Repository Files API](repository_files.md).