ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Left over of merge conflict

Browse Source
This commit is contained in:
Wolfgang Huß 2023-03-16 16:09:18 +01:00
parent 9dbb8cae41
commit 9ded9105a3
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webapp/components/ContributionForm/ContributionForm.vue
View File

@ -172,11 +172,7 @@ export default {
return this.group && this.group.id return this.group && this.group.id
}, },
showGroupHint() { showGroupHint() {
<<<<<<< HEAD
return this.groupId && ['closed', 'hidden'].includes(this.group.groupType) return this.groupId && ['closed', 'hidden'].includes(this.group.groupType)
=======
return this.grouupId && ['closed', 'hidden'].includes(this.group.groupType)
>>>>>>> 4f6c9319fbc8f764a3dace5320039d5a75ad05ac
}, },
groupName() { groupName() {
return this.group && this.group.name return this.group && this.group.name