diff options
Diffstat (limited to 'spec/fixtures/api/schemas')
| -rw-r--r-- | spec/fixtures/api/schemas/issue.json | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/spec/fixtures/api/schemas/issue.json b/spec/fixtures/api/schemas/issue.json index 983beb838b7..ff86437fdd5 100644 --- a/spec/fixtures/api/schemas/issue.json +++ b/spec/fixtures/api/schemas/issue.json @@ -40,13 +40,12 @@ "additionalProperties": false } }, -<<<<<<< HEAD "assignee": { "id": { "type": "integet" }, "name": { "type": "string" }, "username": { "type": "string" }, "avatar_url": { "type": "uri" } -======= + }, "assignees": { "type": "array", "items": { @@ -64,7 +63,6 @@ "avatar_url": { "type": "uri" } } } ->>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master }, "subscribed": { "type": ["boolean", "null"] } }, |