Merge branch 'dev'

2021-03-23 20:58:41 -04:00 · 2021-03-23 20:58:41 -04:00 · 0858f17759
parent 8279268b3b 48aeb72a9d
commit 0858f17759
2 changed files with 0 additions and 26 deletions
--- a/src/configs/channels.json
+++ b/src/configs/channels.json
@ -1,15 +1,6 @@
-<<<<<<< HEAD
 {
  "moderation": {
    "modlogs": "446080867065135115",
    "automod": ""
  }
 }
-=======
-{
-  "moderation": {
-    "modlogs": "446080867065135115",
-    "automod": ""
-  }
-}
->>>>>>> Hiroyuki/communityrelations-master
--- a/src/configs/emotes.json
+++ b/src/configs/emotes.json
@ -1,4 +1,3 @@
-<<<<<<< HEAD
 {
  "whois": {
    "titleAndDepartment": "<:loc:607695848612167700>",
@ -13,19 +12,3 @@
    "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