Fix conflict for app/assets/javascripts/environments/components/environment_item.vue [ci skip]

ea6dc253 · Filipa Lacerda · 5a109128 · ea6dc253
Commit ea6dc253 authored Jan 11, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

app/assets/javascripts/environments/components/environment_item.vue .../javascripts/environments/components/environment_item.vue +0 -5

No files found.
--- a/app/assets/javascripts/environments/components/environment_item.vue
+++ b/app/assets/javascripts/environments/components/environment_item.vue
@@ -673,12 +673,7 @@
        <span class="folder-icon">
          <i
            class="fa fa-folder"
-<<<<<<< HEAD
-            aria-hidden="true"
-          >
-=======
            aria-hidden="true">
->>>>>>> upstream/master
          </i>
        </span>