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

27503755 · Filipa Lacerda · 5c3216cd · 27503755
Commit 27503755 authored Sep 08, 2017 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/views/projects/settings/ci_cd/show.html.haml app/views/projects/settings/ci_cd/show.html.haml +0 -4

No files found.
--- a/app/views/projects/settings/ci_cd/show.html.haml
+++ b/app/views/projects/settings/ci_cd/show.html.haml
@@ -6,11 +6,7 @@

 - expanded = Rails.env.test?

-<<<<<<< HEAD
-%section.settings
-=======
 %section.settings#js-general-pipeline-settings
->>>>>>> upstream/master
  .settings-header
    %h4
      General pipelines settings