Resolve conflicts in doc/api/merge_requests.md

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

doc/api/merge_requests.md

@@ -210,10 +210,6 @@ Parameters:
     "merge_commit_sha": null,
     "user_notes_count": 1,
     "changes_count": "1",
-<<<<<<< HEAD
-    "approvals_before_merge": null
-=======
->>>>>>> upstream/master
     "should_remove_source_branch": true,
     "force_remove_source_branch": false,
     "squash": false,
@@ -224,7 +220,8 @@ Parameters:
       "total_time_spent": 0,
       "human_time_estimate": null,
       "human_total_time_spent": null
-    }
+    },
+    "approvals_before_merge": null
   }
 ]
 ```
@@ -292,10 +289,6 @@ Parameters:
   "merge_commit_sha": "9999999999999999999999999999999999999999",
   "user_notes_count": 1,
   "changes_count": "1",
-<<<<<<< HEAD
-  "approvals_before_merge": null
-=======
->>>>>>> upstream/master
   "should_remove_source_branch": true,
   "force_remove_source_branch": false,
   "squash": false,
@@ -306,7 +299,8 @@ Parameters:
     "total_time_spent": 0,
     "human_time_estimate": null,
     "human_total_time_spent": null
-  }
+  },
+  "approvals_before_merge": null
 }
 ```
 
@@ -410,10 +404,6 @@ Parameters:
   "merge_commit_sha": null,
   "user_notes_count": 1,
   "changes_count": "1",
-<<<<<<< HEAD
-  "approvals_before_merge": null,
-=======
->>>>>>> upstream/master
   "should_remove_source_branch": true,
   "force_remove_source_branch": false,
   "squash": false,
@@ -436,7 +426,8 @@ Parameters:
     "renamed_file": false,
     "deleted_file": false
     }
-  ]
+  ],
+  "approvals_before_merge": null
 }
 ```
 
@@ -521,10 +512,6 @@ order for it to take effect:
   "merge_commit_sha": null,
   "user_notes_count": 0,
   "changes_count": "1",
-<<<<<<< HEAD
-  "approvals_before_merge": null
-=======
->>>>>>> upstream/master
   "should_remove_source_branch": true,
   "force_remove_source_branch": false,
   "squash": false,
@@ -535,7 +522,8 @@ order for it to take effect:
     "total_time_spent": 0,
     "human_time_estimate": null,
     "human_total_time_spent": null
-  }
+  },
+  "approvals_before_merge": null
 }
 ```
 
@@ -613,10 +601,6 @@ Must include at least one non-required attribute from above.
   "merge_commit_sha": null,
   "user_notes_count": 1,
   "changes_count": "1",
-<<<<<<< HEAD
-  "approvals_before_merge": null
-=======
->>>>>>> upstream/master
   "should_remove_source_branch": true,
   "force_remove_source_branch": false,
   "squash": false,
@@ -627,7 +611,8 @@ Must include at least one non-required attribute from above.
     "total_time_spent": 0,
     "human_time_estimate": null,
     "human_total_time_spent": null
-  }
+  },
+  "approvals_before_merge": null
 }
 ```
 
@@ -724,10 +709,6 @@ Parameters:
   "merge_commit_sha": "9999999999999999999999999999999999999999",
   "user_notes_count": 1,
   "changes_count": "1",
-<<<<<<< HEAD
-  "approvals_before_merge": null
-=======
->>>>>>> upstream/master
   "should_remove_source_branch": true,
   "force_remove_source_branch": false,
   "squash": false,
@@ -738,7 +719,8 @@ Parameters:
     "total_time_spent": 0,
     "human_time_estimate": null,
     "human_total_time_spent": null
-  }
+  },
+  "approvals_before_merge": null
 }
 ```
 
@@ -933,10 +915,6 @@ Parameters:
   "merge_commit_sha": null,
   "user_notes_count": 1,
   "changes_count": "1",
-<<<<<<< HEAD
-  "approvals_before_merge": null
-=======
->>>>>>> upstream/master
   "should_remove_source_branch": true,
   "force_remove_source_branch": false,
   "squash": false,
@@ -947,7 +925,8 @@ Parameters:
     "total_time_spent": 0,
     "human_time_estimate": null,
     "human_total_time_spent": null
-  }
+  },
+  "approvals_before_merge": null
 }
 ```
 
@@ -1014,13 +993,9 @@ Example response when the GitLab issue tracker is used:
       "iid" : 6,
       "labels" : [],
       "user_notes_count": 1,
-<<<<<<< HEAD
       "changes_count": "1",
       "approvals_before_merge": null
-=======
-      "changes_count": "1"
->>>>>>> upstream/master
-   },
+   }
 ]
 ```