From 17899df88286eb9410851412aed7b6d99f743199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Fri, 25 Feb 2022 15:12:37 +0800
Subject: [PATCH] merge

---
 static/.DS_Store    | Bin 12292 -> 12292 bytes
 store/modules/im.js |   4 ----
 2 files changed, 4 deletions(-)

diff --git a/static/.DS_Store b/static/.DS_Store
index 0958084929c98385330ae932897c37b36763392c..177ce3c00bf7a29756b0a7c7f91cc202ec497b9f 100644
GIT binary patch
delta 24
fcmZokXi3;mue{kuK#7ql#9?xQVC7~R)fZd<ZPN%=

delta 44
zcmZokXi3;mugoMQJ-Ja?eDWvp|4hmblV3>$a(Xg)G5RnDG6qdPAgH-nM)d_309V%z
AfB*mh

diff --git a/store/modules/im.js b/store/modules/im.js
index 10bfeac..01e2b92 100644
--- a/store/modules/im.js
+++ b/store/modules/im.js
@@ -47,14 +47,10 @@ export default {
                 name: contactInfo.name,
                 portraitUrl: contactInfo.portraitUrl
             }
-<<<<<<< HEAD
-        }
-=======
         },
         setContactRemark(state, contactInfo) {
             Vue.set(state.contacts, contactInfo.targetId, contactInfo)
         }
->>>>>>> 013c030963aef06a00ac33d5f767cbd97ef2ceac
     },
     actions: {
         setContactRemark({