Merge remote-tracking branch 'origin/main'

# Conflicts:
#	package-lock.json
#	package.json
#	src/utils/devIDs.ts

package.json

@@ -27,20 +27,18 @@
   "homepage": "https://github.com/veganhacktivists/arabot#readme",
   "dependencies": {
     "@prisma/client": "^4.0.0",
-    "@sapphire/framework": "^3.0.0-next.7dd13af.0",
+    "@sapphire/framework": "^3.0.0",
-    "@sapphire/plugin-scheduled-tasks": "^4.0.0-next.15d7f9b.0",
+    "@sapphire/plugin-scheduled-tasks": "^4.0.0",
-    "@sapphire/plugin-subcommands": "^2.2.2",
+    "@sapphire/plugin-subcommands": "^3.0.0",
     "@sapphire/stopwatch": "^1.4.1",
     "@sapphire/ts-config": "^3.3.4",
-    "@sapphire/utilities": "^3.7.0",
+    "@sapphire/utilities": "^3.9.2",
-    "@types/cron": "^2.0.0",
     "@types/node": "^18.0.3",
-    "bullmq": "^1.87.2",
+    "bullmq": "^1.89.1",
-    "cron": "^2.1.0",
     "discord-api-types": "^0.33.3",
-    "discord.js": "^13.9.2",
+    "discord.js": "^13.10.2",
     "dotenv": "^16.0.1",
-    "prisma": "^4.0.0",
+    "prisma": "^4.2.1",
     "ts-node": "^10.8.2",
     "typescript": "^4.7.4"
   },

src/utils/devIDs.ts

@@ -60,10 +60,7 @@ const devIDs = {
     staff: {
       coordinators: '999431676058927254',
       standup: '999431676289622183',
-<<<<<<< HEAD
       verifiers: '999431677006860411',
-=======
->>>>>>> origin/main
     },
     diversity: {
       women: '999431679053660187',

src/utils/ids.ts

@@ -17,7 +17,6 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-// eslint-disable-next-line import/extensions
 import devIDs from './devIDs';
 
 let IDs = {