Update diff_check.rb

f8850079 · Francisco Javier López · 6b09a03e · f8850079
Commit f8850079 authored Dec 04, 2018 by Francisco Javier López
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/gitlab/checks/diff_check.rb lib/gitlab/checks/diff_check.rb +0 -3

No files found.
--- a/lib/gitlab/checks/diff_check.rb
+++ b/lib/gitlab/checks/diff_check.rb
@@ -4,10 +4,7 @@ module Gitlab
  module Checks
    class DiffCheck < BaseChecker
      include Gitlab::Utils::StrongMemoize
-<<<<<<< HEAD
      prepend EE::Gitlab::Checks::DiffCheck
-=======
->>>>>>> upstream/master
      LOG_MESSAGES = {
        validate_file_paths: "Validating diffs' file paths...",