[ci skip] Fix conflicts for...

[ci skip] Fix conflicts for app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue

[ci skip] Fix conflicts for...
[ci skip] Fix conflicts for app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
553adf88 · Filipa Lacerda · 0ca1f354 · 553adf88 · 553adf88
Commit 553adf88 authored Jun 14, 2018 by Filipa Lacerda
2 changed files
--- a/app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue
+++ b/app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue
@@ -34,10 +34,6 @@ export default {
    class="btn btn-blank gutter-toggle btn-sidebar-action"
    data-container="body"
    data-placement="left"
-<<<<<<< HEAD
-    data-boundary="viewport"
-=======
->>>>>>> upstream/master
    @click="toggle"
  >
    <i

--- a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
+++ b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
@@ -99,9 +99,5 @@ export default {
    :data-placement="tooltipPlacement"
    :title="tooltipText"
    class="avatar"
-<<<<<<< HEAD
-=======
-    data-boundary="window"
->>>>>>> upstream/master
  />
 </template>