app/views/ci/variables/_variable_row.html.haml

4792e71b · Mario de la Ossa · 70808fcb · 4792e71b
Commit 4792e71b authored Feb 05, 2018 by Mario de la Ossa
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/views/ci/variables/_variable_row.html.haml app/views/ci/variables/_variable_row.html.haml +0 -3

No files found.
--- a/app/views/ci/variables/_variable_row.html.haml
+++ b/app/views/ci/variables/_variable_row.html.haml
@@ -44,10 +44,7 @@
            = sprite_icon('status_success_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-checked')
            = sprite_icon('status_failed_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-unchecked')
      -# EE-specific start
-<<<<<<< HEAD
      = render 'ci/variables/environment_scope', form_field: form_field, variable: variable
-=======
->>>>>>> upstream/master
      -# EE-specific end
  %button.js-row-remove-button.ci-variable-row-remove-button{ type: 'button', 'aria-label': s_('CiVariables|Remove variable row') }
    = icon('minus-circle')