Update base_checker.rb

5e533ace · Francisco Javier López · 469a258a · 5e533ace
Commit 5e533ace 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/base_checker.rb lib/gitlab/checks/base_checker.rb +0 -3

No files found.
--- a/lib/gitlab/checks/base_checker.rb
+++ b/lib/gitlab/checks/base_checker.rb
@@ -3,10 +3,7 @@
 module Gitlab
  module Checks
    class BaseChecker
-<<<<<<< HEAD
      prepend EE::Gitlab::Checks::BaseChecker
-=======
->>>>>>> upstream/master
      include Gitlab::Utils::StrongMemoize
      attr_reader :change_access