Resolve conflict in issue_boards.json

spec/fixtures/api/schemas/entities/issue_boards.json

@@ -2,24 +2,16 @@
   "type": "object",
   "required" : [
     "issues",
-<<<<<<< HEAD
     "size",
     "total_weight"
-=======
-    "size"
->>>>>>> upstream/master
   ],
   "properties" : {
     "issues": {
       "type": "array",
       "items": { "$ref": "issue_board.json" }
     },
-<<<<<<< HEAD
     "size": { "type": "integer" },
     "total_weight": { "type": "integer" }
-=======
-    "size": { "type": "integer" }
->>>>>>> upstream/master
   },
   "additionalProperties": false
 }