Resove conflicts in doc/api/merge_requests.md

doc/api/merge_requests.md

@@ -117,12 +117,8 @@ Parameters:
       "human_time_estimate": null,
       "human_total_time_spent": null
     },
-<<<<<<< HEAD
     "squash": false,
     "approvals_before_merge": null
-=======
-    "squash": false
->>>>>>> upstream/master
   }
 ]
 ```
@@ -245,12 +241,8 @@ Parameters:
       "human_time_estimate": null,
       "human_total_time_spent": null
     },
-<<<<<<< HEAD
     "squash": false,
     "approvals_before_merge": null
-=======
-    "squash": false
->>>>>>> upstream/master
   }
 ]
 ```
@@ -361,12 +353,8 @@ Parameters:
       "human_time_estimate": null,
       "human_total_time_spent": null
     },
-<<<<<<< HEAD
     "squash": false,
     "approvals_before_merge": null
-=======
-    "squash": false
->>>>>>> upstream/master
   }
 ]
 ```
@@ -809,12 +797,8 @@ order for it to take effect:
     "head_sha": "2be7ddb704c7b6b83732fdd5b9f09d5a397b5f8f",
     "start_sha": "c380d3acebd181f13629a25d2e2acca46ffe1e00"
   },
-<<<<<<< HEAD
   "diverged_commits_count": 2,
   "approvals_before_merge": null
-=======
-  "diverged_commits_count": 2
->>>>>>> upstream/master
 }
 ```
 
@@ -941,12 +925,8 @@ Must include at least one non-required attribute from above.
     "head_sha": "2be7ddb704c7b6b83732fdd5b9f09d5a397b5f8f",
     "start_sha": "c380d3acebd181f13629a25d2e2acca46ffe1e00"
   },
-<<<<<<< HEAD
   "diverged_commits_count": 2,
   "approvals_before_merge": null
-=======
-  "diverged_commits_count": 2
->>>>>>> upstream/master
 }
 ```
 
@@ -1089,12 +1069,8 @@ Parameters:
     "head_sha": "2be7ddb704c7b6b83732fdd5b9f09d5a397b5f8f",
     "start_sha": "c380d3acebd181f13629a25d2e2acca46ffe1e00"
   },
-<<<<<<< HEAD
   "diverged_commits_count": 2,
   "approvals_before_merge": null
-=======
-  "diverged_commits_count": 2
->>>>>>> upstream/master
 }
 ```
 
@@ -1209,12 +1185,8 @@ Parameters:
     "head_sha": "2be7ddb704c7b6b83732fdd5b9f09d5a397b5f8f",
     "start_sha": "c380d3acebd181f13629a25d2e2acca46ffe1e00"
   },
-<<<<<<< HEAD
   "diverged_commits_count": 2,
   "approvals_before_merge": null
-=======
-  "diverged_commits_count": 2
->>>>>>> upstream/master
 }
 ```
 
@@ -1413,12 +1385,8 @@ Example response:
     "head_sha": "2be7ddb704c7b6b83732fdd5b9f09d5a397b5f8f",
     "start_sha": "c380d3acebd181f13629a25d2e2acca46ffe1e00"
   },
-<<<<<<< HEAD
   "diverged_commits_count": 2,
   "approvals_before_merge": null
-=======
-  "diverged_commits_count": 2
->>>>>>> upstream/master
 }
 ```
 
@@ -1539,12 +1507,8 @@ Example response:
     "head_sha": "2be7ddb704c7b6b83732fdd5b9f09d5a397b5f8f",
     "start_sha": "c380d3acebd181f13629a25d2e2acca46ffe1e00"
   },
-<<<<<<< HEAD
   "diverged_commits_count": 2,
   "approvals_before_merge": null
-=======
-  "diverged_commits_count": 2
->>>>>>> upstream/master
 }
 ```