Fix conflicts caused by vue_shared/components/user_avatar/user_avatar_image.vue

1397db0f · Filipa Lacerda · 26342bf0 · 1397db0f
Commit 1397db0f authored Jun 13, 2018 by Filipa Lacerda
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue ...s/vue_shared/components/user_avatar/user_avatar_image.vue +1 -2

No files found.
--- 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
@@ -85,8 +85,6 @@ export default {
 <template>
  <img
    v-tooltip
-    class="avatar"
-    data-boundary="window"
    :class="{
      lazy: lazy,
      [avatarSizeClass]: true,
@@ -101,5 +99,6 @@ export default {
    :data-placement="tooltipPlacement"
    :title="tooltipText"
    class="avatar"
+    data-boundary="window"
  />
 </template>