From de3a4f0950523e312b320c47da1c99486c754dea Mon Sep 17 00:00:00 2001
From: saschrad <saschrad@stud.ntnu.no>
Date: Tue, 3 May 2022 15:57:58 +0200
Subject: [PATCH] Fixed merge conflict
---
src/components/ChatComponents/ChatProfile.vue | 6 ------
1 file changed, 6 deletions(-)
diff --git a/src/components/ChatComponents/ChatProfile.vue b/src/components/ChatComponents/ChatProfile.vue
index 8c309a4..f09eb7b 100644
--- a/src/components/ChatComponents/ChatProfile.vue
+++ b/src/components/ChatComponents/ChatProfile.vue
@@ -52,13 +52,7 @@ export default {
},
methods: {
selectUser() {
-<<<<<<< HEAD
- console.log(this.conversation?.recipient.userId);
this.$emit("recipient", this.conversation?.recipient.userId);
-=======
- //console.log(this.conversation.recipient.userId);
- this.$emit("recipient", this.conversation.recipient.userId);
->>>>>>> 3fd875332a013afe5b731aa96a2e2c2ce2351891
},
},
created() {
--
GitLab