Fix conflict in app/views/import/github/new.html.haml

7943922e · Rubén Dávila · ffea2a15 · 7943922e
Commit 7943922e authored Mar 07, 2018 by Rubén Dávila
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/views/import/github/new.html.haml app/views/import/github/new.html.haml +0 -3

No files found.
--- a/app/views/import/github/new.html.haml
+++ b/app/views/import/github/new.html.haml
@@ -23,10 +23,7 @@
    = submit_tag _('List your GitHub repositories'), class: 'btn btn-success'

  -# EE-specific start
-<<<<<<< HEAD
  = hidden_field_tag :ci_cd_only, params[:ci_cd_only]
-=======
->>>>>>> upstream/master
  -# EE-specific end

 - unless github_import_configured?