diff options
| author | Alee <alee14498@gmail.com> | 2018-02-25 14:54:37 -0500 |
|---|---|---|
| committer | Alee <alee14498@gmail.com> | 2018-02-25 14:54:37 -0500 |
| commit | 3e06bff720bd660ef41ce2e149004836595b4e40 (patch) | |
| tree | 0f66307832ceca562df3d13bbdd6fd46e4625ac5 /package.json | |
| parent | 2297ebb012e5522ce3b8360c404f522ed30dd985 (diff) | |
| parent | 94eeeec5b7d4d29ae9d372fc1b86ce5351112548 (diff) | |
| download | AleeBot-3e06bff720bd660ef41ce2e149004836595b4e40.tar.gz AleeBot-3e06bff720bd660ef41ce2e149004836595b4e40.tar.bz2 AleeBot-3e06bff720bd660ef41ce2e149004836595b4e40.zip | |
2.0 release (I hope it will work)
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 26 |
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 |