Resolve conflict in scripts/lint-rugged

94d4b626 · Marin Jankovski · 841584cb · 94d4b626
Commit 94d4b626 authored Feb 02, 2018 by Marin Jankovski
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

scripts/lint-rugged scripts/lint-rugged +0 -3

No files found.
--- a/scripts/lint-rugged
+++ b/scripts/lint-rugged
 #!/usr/bin/env ruby

 ALLOWED = [
-<<<<<<< HEAD
  # https://gitlab.com/gitlab-org/gitaly/issues/760
  'lib/elasticsearch/git/repository.rb',

-=======
->>>>>>> upstream/master
  # Can be fixed once Rugged is no longer used in production. Doesn't make Rugged calls.
  'config/initializers/8_metrics.rb',