1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
<<<<<<< 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",
"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
|
