Skip to content

G
gitlab-ce
Commit 94d4b626 authored by Marin Jankovski's avatar Marin Jankovski
Browse files
Options

Resolve conflict in scripts/lint-rugged

parent 841584cb
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
scripts/lint-rugged
View file @ 94d4b626
#!/usr/bin/env ruby #!/usr/bin/env ruby
ALLOWED = [ ALLOWED = [
<<<<<<< HEAD
# https://gitlab.com/gitlab-org/gitaly/issues/760 # https://gitlab.com/gitlab-org/gitaly/issues/760
'lib/elasticsearch/git/repository.rb', 'lib/elasticsearch/git/repository.rb',
=======
>>>>>>> upstream/master
# Can be fixed once Rugged is no longer used in production. Doesn't make Rugged calls. # Can be fixed once Rugged is no longer used in production. Doesn't make Rugged calls.
'config/initializers/8_metrics.rb', '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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7