From b0a9a7cf5ee670ae07c4a9751d9c6e8bed1063b7 Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Thu, 4 May 2017 17:22:24 +0300
Subject: [Multiple issue assignee]: reslving some conflicts

---
 spec/fixtures/api/schemas/issue.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'spec/fixtures/api/schemas/issue.json')

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"] }
   },
-- 
cgit v1.2.3