diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-18 12:37:03 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-18 12:37:03 +0300 |
| commit | b403e28f5008565b8f26247da3eb6ab9508a1304 (patch) | |
| tree | 2bbe5fe7bc32f858b8c363458d3b1d2887a8ee22 /spec | |
| parent | b398fed43b2a5030dd9e0907ef0a3385340e5afe (diff) | |
Resolve conflict in favicon_spec.rb
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/gitlab/favicon_spec.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/spec/lib/gitlab/favicon_spec.rb b/spec/lib/gitlab/favicon_spec.rb index ad3e7c6b5f7..5e54fd2a1f9 100644 --- a/spec/lib/gitlab/favicon_spec.rb +++ b/spec/lib/gitlab/favicon_spec.rb @@ -18,13 +18,8 @@ RSpec.describe Gitlab::Favicon, :request_store do end it 'uses the custom favicon if a favicon appearance is present' do -<<<<<<< HEAD create :appearance, favicon: fixture_file_upload(Rails.root.join('spec/fixtures/dk.png')) - expect(described_class.main).to match %r{/uploads/-/system/appearance/favicon/\d+/favicon_main_dk.png} -======= - create :appearance, favicon: fixture_file_upload('spec/fixtures/dk.png') expect(described_class.main).to match %r{/uploads/-/system/appearance/favicon/\d+/dk.png} ->>>>>>> 26810dd771... Merge branch 'dm-remove-favicon-main-version' into 'master' end end |