diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-01 13:15:28 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:44 +0300 |
| commit | 4d8b0293aed69b6c379be3be63d5f05fd3a7106b (patch) | |
| tree | e117f1698ec90c3d53df86d5988690c01036261e /lib/gitlab/conflict | |
| parent | 99e00856ebb09b8edc9729b7f21a8005aaf02cb3 (diff) | |
Remove unneeded raise
Diffstat (limited to 'lib/gitlab/conflict')
| -rw-r--r-- | lib/gitlab/conflict/file_collection.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/gitlab/conflict/file_collection.rb b/lib/gitlab/conflict/file_collection.rb index 46e381d2661..e621a76a7de 100644 --- a/lib/gitlab/conflict/file_collection.rb +++ b/lib/gitlab/conflict/file_collection.rb @@ -42,9 +42,6 @@ module Gitlab their_path = conflict[:theirs][: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), conflict, diff_refs: merge_request.diff_refs, |