Resolve scripts/lint-rugged conflicts

2747dcca · Robert Speicher · fe826756 · 2747dcca
Commit 2747dcca authored Jan 25, 2018 by Robert Speicher
Show 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 deleted (?) once rugged is no longer used in production. Doesn't make Rugged calls.
  'config/initializers/8_metrics.rb',