1 files changed, 26 insertions, 0 deletions
diff --git a/package.json b/package.json
index 08995ad..48bb974 100644
--- a/package.json
+++ b/package.json
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 {
   "name": "aleebot",
   "version": "1.1.0",
@@ -24,3 +25,28 @@
   },
   "homepage": "https://github.com/AleeCorp/AleeBot#readme"
 }
+=======
+{
+  "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