engineering
/
community-relations
3
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 1 Wiki Activity

more merge conflict fixes

merge-requests/25/merge
Matthew 2021-03-23 20:58:15 -04:00
parent 31ef35d3af
commit 48aeb72a9d
No known key found for this signature in database
GPG Key ID: 210AF32ADE3B5C4B
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/configs/channels.json
View File

@ -1,15 +1,6 @@
<<<<<<< HEAD
{ {
"moderation": { "moderation": {
"modlogs": "446080867065135115", "modlogs": "446080867065135115",
"automod": "" "automod": ""
} }
} }
=======
{
"moderation": {
"modlogs": "446080867065135115",
"automod": ""
}
}
>>>>>>> Hiroyuki/communityrelations-master

17
src/configs/emotes.json
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
{ {
"whois": { "whois": {
"titleAndDepartment": "<:loc:607695848612167700>", "titleAndDepartment": "<:loc:607695848612167700>",
@ -13,19 +12,3 @@
"error": "<:modError:578750737920688128>" "error": "<:modError:578750737920688128>"
} }
} }
=======
{
"whois": {
"titleAndDepartment": "<:loc:607695848612167700>",
"email": "<:email:699786452267040878>",
"gitlab": "<:gitlab:699788655748841492>",
"github": "<:github:699786469404835939>",
"bio": "<:bio:699786408193294416>"
},
"statusMessages": {
"success": "<:modSuccess:578750988907970567>",
"loading": "<a:modloading:588607353935364106>",
"error": "<:modError:578750737920688128>"
}
}
>>>>>>> Hiroyuki/communityrelations-master