Resolve doc/api/issues.md

doc/api/issues.md

@@ -360,16 +360,13 @@ Example response:
    "due_date": null,
    "web_url": "http://example.com/example/example/issues/1",
    "confidential": false,
-<<<<<<< HEAD
-   "weight": null
-=======
+   "weight": null,
    "_links": {
       "self": "http://example.com/api/v4/projects/1/issues/2",
       "notes": "http://example.com/api/v4/projects/1/issues/2/notes",
       "award_emoji": "http://example.com/api/v4/projects/1/issues/2/award_emoji",
       "project": "http://example.com/api/v4/projects/1"
    }
->>>>>>> upstream/master
 }
 ```
 
@@ -433,16 +430,13 @@ Example response:
    "due_date": null,
    "web_url": "http://example.com/example/example/issues/14",
    "confidential": false,
-<<<<<<< HEAD
-   "weight": null
-=======
+   "weight": null,
    "_links": {
       "self": "http://example.com/api/v4/projects/1/issues/2",
       "notes": "http://example.com/api/v4/projects/1/issues/2/notes",
       "award_emoji": "http://example.com/api/v4/projects/1/issues/2/award_emoji",
       "project": "http://example.com/api/v4/projects/1"
    }
->>>>>>> upstream/master
 }
 ```
 
@@ -507,16 +501,13 @@ Example response:
    "due_date": "2016-07-22",
    "web_url": "http://example.com/example/example/issues/15",
    "confidential": false,
-<<<<<<< HEAD
-   "weight": null
-=======
+   "weight": null,
    "_links": {
       "self": "http://example.com/api/v4/projects/1/issues/2",
       "notes": "http://example.com/api/v4/projects/1/issues/2/notes",
       "award_emoji": "http://example.com/api/v4/projects/1/issues/2/award_emoji",
       "project": "http://example.com/api/v4/projects/1"
    }
->>>>>>> upstream/master
 }
 ```
 
@@ -603,16 +594,13 @@ Example response:
   "due_date": null,
   "web_url": "http://example.com/example/example/issues/11",
   "confidential": false,
-<<<<<<< HEAD
-  "weight": null
-=======
+  "weight": null,
   "_links": {
     "self": "http://example.com/api/v4/projects/1/issues/2",
     "notes": "http://example.com/api/v4/projects/1/issues/2/notes",
     "award_emoji": "http://example.com/api/v4/projects/1/issues/2/award_emoji",
     "project": "http://example.com/api/v4/projects/1"
   }
->>>>>>> upstream/master
 }
 ```
 
@@ -678,16 +666,13 @@ Example response:
   "due_date": null,
   "web_url": "http://example.com/example/example/issues/11",
   "confidential": false,
-<<<<<<< HEAD
-  "weight": null
-=======
+  "weight": null,
   "_links": {
     "self": "http://example.com/api/v4/projects/1/issues/2",
     "notes": "http://example.com/api/v4/projects/1/issues/2/notes",
     "award_emoji": "http://example.com/api/v4/projects/1/issues/2/award_emoji",
     "project": "http://example.com/api/v4/projects/1"
   }
->>>>>>> upstream/master
 }
 ```