Commit 94d4b626 authored by Marin Jankovski's avatar Marin Jankovski

Resolve conflict in scripts/lint-rugged

parent 841584cb
#!/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',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment