Resolve conflicts in spec/fixtures/api/schemas/entities/merge_request_widget.json

f1e4d286 · Stan Hu · 7b50ba8a · f1e4d286
Commit f1e4d286 authored May 30, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

spec/fixtures/api/schemas/entities/merge_request_widget.json spec/fixtures/api/schemas/entities/merge_request_widget.json +0 -4

No files found.
--- a/spec/fixtures/api/schemas/entities/merge_request_widget.json
+++ b/spec/fixtures/api/schemas/entities/merge_request_widget.json
@@ -114,7 +114,6 @@
    "rebase_in_progress": { "type": "boolean" },
    "can_push_to_source_branch": { "type": "boolean" },
    "rebase_path": { "type": ["string", "null"] },
-<<<<<<< HEAD
    "squash": { "type": "boolean" },
    // EE-specific
@@ -130,9 +129,6 @@
      "base_path": { "type": "string" }
    },
    "vulnerability_feedback_path": { "type": "string" }
-=======
-    "squash": { "type": "boolean" }
->>>>>>> upstream/master
  },
  "additionalProperties": false
 }