Commit 4d8b0293 authored by Sean McGivern's avatar Sean McGivern Committed by Fatih Acet

Remove unneeded raise

parent 99e00856
...@@ -42,9 +42,6 @@ module Gitlab ...@@ -42,9 +42,6 @@ module Gitlab
their_path = conflict[:theirs][:path] their_path = conflict[:theirs][:path]
our_path = conflict[:ours][:path] our_path = conflict[:ours][:path]
# TODO remove this
raise 'path mismatch!' unless their_path == our_path
Gitlab::Conflict::File.new(merge_index.merge_file(our_path), Gitlab::Conflict::File.new(merge_index.merge_file(our_path),
conflict, conflict,
diff_refs: merge_request.diff_refs, diff_refs: merge_request.diff_refs,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment