Skip to content

G
gitlab-ce
Commit 27503755 authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files
Options

[ci skip] Fixes conflicts for `app/views/projects/settings/ci_cd/show.html.haml`

parent 5c3216cd
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
app/views/projects/settings/ci_cd/show.html.haml
View file @ 27503755
...@@ -6,11 +6,7 @@ ...@@ -6,11 +6,7 @@
- expanded = Rails.env.test? - expanded = Rails.env.test?
<<<<<<< HEAD
%section.settings
=======
%section.settings#js-general-pipeline-settings %section.settings#js-general-pipeline-settings
>>>>>>> upstream/master
.settings-header .settings-header
%h4 %h4
General pipelines settings General pipelines settings
......
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