Merge branch 'master' of https://github.com/repl-it-discord/repl-it-starboard

Author: TheDrone7

bot/bot.js

@@ -19,12 +19,16 @@ class Starboard extends AkairoClient {
       }
     );
 
+<<<<<<< HEAD
     this.commandHandler = new CommandHandler(this, {
       directory: './bot/commands/',
       prefix: 's!',
       ignorePermissions: [this.ownerID],
       automateCategories: true
     });
+=======
+    this.commandHandler = new CommandHandler(this, { directory: './bot/commands/', prefix: '*' });
+>>>>>>> 0185f2dd3310ec21aaa475533b14e47198f4cd63
     this.listenerHandler = new ListenerHandler(this, { directory: './bot/events/' });
     this.listenerHandler.loadAll();
 

package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "scripts": {
-    "prestart": "prettier --write \"bot\/**\/*.js\"",
+    "prestart": "prettier --write \"bot/**/*.js\"",
     "start": "node index.js"
   },
   "dependencies": {