1 files changed, 29 insertions, 0 deletions
diff --git a/package.json b/package.json
index b10a8a1..48bb974 100644
--- a/package.json
+++ b/package.json
@@ -1,3 +1,31 @@
+<<<<<<< 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": {},
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/AleeCorp/AleeBot.git"
+  },
+  "author": "alee14",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/AleeCorp/AleeBot/issues"
+  },
+  "homepage": "https://github.com/AleeCorp/AleeBot#readme"
+}
+=======
 {
   "name": "aleebot",
   "version": "2.0.0",
@@ -21,3 +49,4 @@
     "node-telegram-bot-api": "^0.29.0"
   }
 }
+>>>>>>> beta