1 files changed, 10 insertions, 39 deletions
diff --git a/package.json b/package.json
index 48bb974..d35c79a 100644
--- a/package.json
+++ b/package.json
@@ -1,52 +1,23 @@
-<<<<<<< HEAD
 {
   "name": "aleebot",
-  "version": "1.1.0",
-  "description": "A chat bot for discord written in discord.js",
-  "main": "aleebot.js",
-  "dependencies": {
-    "blessed": "^0.1.81",
-    "discord.js": "^11.1.0",
-    "fs": "^0.0.1-security",
-    "moment": "^2.18.1"
-  },
-  "devDependencies": {},
+  "version": "2.0.0",
+  "description": "A chat bot for discord written in discord.js.",
+  "main": "src/bot.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": ""
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/AleeCorp/AleeBot.git"
   },
-  "author": "alee14",
+  "author": "",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/AleeCorp/AleeBot/issues"
   },
-  "homepage": "https://github.com/AleeCorp/AleeBot#readme"
+  "homepage": "https://github.com/AleeCorp/AleeBot#readme",
+  "dependencies": {
+    "discord.js": "^11.2.1",
+    "node-telegram-bot-api": "^0.29.0"
+  }
 }
-=======
-{
-  "name": "aleebot",
-  "version": "2.0.0",
-  "description": "A chat bot for discord written in discord.js.",
-  "main": "src/bot.js",
-  "scripts": {
-    "test": ""
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/AleeCorp/AleeBot.git"
-  },
-  "author": "",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/AleeCorp/AleeBot/issues"
-  },
-  "homepage": "https://github.com/AleeCorp/AleeBot#readme",
-  "dependencies": {
-    "discord.js": "^11.2.1",
-    "node-telegram-bot-api": "^0.29.0"
-  }
-}
->>>>>>> beta