Commit d002d8ef authored by Simon Knox's avatar Simon Knox

Fix conflict in project.html

parent 036a8f3e
...@@ -347,13 +347,7 @@ ...@@ -347,13 +347,7 @@
= link_to project_settings_ci_cd_path(@project), title: _('CI / CD') do = link_to project_settings_ci_cd_path(@project), title: _('CI / CD') do
%span %span
= _('CI / CD') = _('CI / CD')
<<<<<<< HEAD
= render_if_exists 'projects/sidebar/settings_operations'
=======
= render_if_exists 'projects/sidebar/settings_operations' = render_if_exists 'projects/sidebar/settings_operations'
>>>>>>> upstream/master
- if @project.pages_available? - if @project.pages_available?
= nav_link(controller: :pages) do = nav_link(controller: :pages) do
= link_to project_pages_path(@project), title: _('Pages') do = link_to project_pages_path(@project), title: _('Pages') do
......
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