merge

2022-02-25 15:12:37 +08:00
parent d9f379d489
commit 17899df882
2 changed files with 0 additions and 4 deletions
--- a/static/.DS_Store
+++ b/static/.DS_Store
--- 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({