From ad4631ce0f554bd67d5eec557e2a98781b03e718 Mon Sep 17 00:00:00 2001
From: zazzaz <izazzaz@hotmail.com>
Date: Wed, 5 Aug 2020 23:00:21 +0800
Subject: [PATCH] fix: update merge error

---
 packages/avatar/src/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/avatar/src/index.vue b/packages/avatar/src/index.vue
index 9a7fee7e75..5100a4595c 100644
--- a/packages/avatar/src/index.vue
+++ b/packages/avatar/src/index.vue
@@ -5,7 +5,7 @@
       :src="src"
       :alt="alt"
       :srcset="srcSet"
-      :style="{objectFit: fit}"
+      :style="fitStyle"
       @error="handleError"
     >
     <i v-else-if="icon" :class="icon"></i>