From 9ded9105a3a5641a2a7ba40b27f6a84f0b21320c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 16 Mar 2023 16:09:18 +0100 Subject: [PATCH] Left over of merge conflict --- webapp/components/ContributionForm/ContributionForm.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue index 0fe21a6ef..8863fbc8a 100644 --- a/webapp/components/ContributionForm/ContributionForm.vue +++ b/webapp/components/ContributionForm/ContributionForm.vue @@ -172,11 +172,7 @@ export default { return this.group && this.group.id }, showGroupHint() { -<<<<<<< HEAD return this.groupId && ['closed', 'hidden'].includes(this.group.groupType) -======= - return this.grouupId && ['closed', 'hidden'].includes(this.group.groupType) ->>>>>>> 4f6c9319fbc8f764a3dace5320039d5a75ad05ac }, groupName() { return this.group && this.group.name