Fix conflicts for...

Fix conflicts for app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue [ci skip]

Fix conflicts for...
Fix conflicts for app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue [ci skip]
0ca1f354 · Filipa Lacerda · c4e7c5b9 · 0ca1f354
Commit 0ca1f354 authored Jun 14, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue ...onents/sidebar/labels_select/dropdown_value_collapsed.vue +0 -4

No files found.
--- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue
+++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue
@@ -41,10 +41,6 @@ export default {
    class="sidebar-collapsed-icon"
    data-placement="left"
    data-container="body"
-<<<<<<< HEAD
-    data-boundary="viewport"
-=======
->>>>>>> upstream/master
    @click="handleClick"
  >
    <i