Resolve conflicts in app/views/shared/_import_form.html.haml

0c90f9e5 · Stan Hu · 265d7da5 · 0c90f9e5
Commit 0c90f9e5 authored May 30, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/views/shared/_import_form.html.haml app/views/shared/_import_form.html.haml +0 -3

No files found.
--- a/app/views/shared/_import_form.html.haml
+++ b/app/views/shared/_import_form.html.haml
@@ -18,7 +18,6 @@
          = import_will_timeout_message(ci_cd_only)
        %li
          = import_svn_message(ci_cd_only)
-<<<<<<< HEAD
        %li
          The Git LFS objects will be ignored.
        - unless ci_cd_only
@@ -29,5 +28,3 @@
 -# EE-specific start
 = render 'shared/ee/import_form', f: f unless ci_cd_only
 -# EE-specific end
-=======
->>>>>>> upstream/master