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

resolve conflicts 2

Browse Source
This commit is contained in:
ogerly 2022-09-08 12:20:28 +02:00
parent f6de01e821
commit 571e8fbddc
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webapp/graphql/groups.js
View File

@ -161,20 +161,12 @@ export const groupQuery = gql`
description description
groupType groupType
actionRadius actionRadius
<<<<<<< HEAD
myRole
=======
>>>>>>> 5059-epic-groups
categories { categories {
id id
slug slug
name name
icon icon
} }
<<<<<<< HEAD
# avatar # test this as result
# locationName # test this as result
=======
avatar { avatar {
url url
} }
@ -191,7 +183,6 @@ export const groupMembersQuery = gql`
name name
slug slug
myRoleInGroup myRoleInGroup
>>>>>>> 5059-epic-groups
} }
} }
` `