diff options
| author | Valery Sizov <valery@gitlab.com> | 2017-05-04 17:22:24 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2017-05-04 17:22:24 +0300 |
| commit | b0a9a7cf5ee670ae07c4a9751d9c6e8bed1063b7 (patch) | |
| tree | 1d7d2f8e02c8ca87a2bed44d86dded599671dfdb /spec/fixtures | |
| parent | 387c4b2c21a44360386a9b8ce6849e7f1b8a3de9 (diff) | |
| download | gitlab-ce-b0a9a7cf5ee670ae07c4a9751d9c6e8bed1063b7.tar.gz | |
[Multiple issue assignee]: reslving some conflicts
Diffstat (limited to 'spec/fixtures')
| -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"] } }, |