2013-10-02 12:04:01 +00:00
|
|
|
{
|
2015-09-05 11:57:25 +00:00
|
|
|
<<<<<<< HEAD
|
2013-10-02 12:04:01 +00:00
|
|
|
"name": "statusbot",
|
|
|
|
"description": "ctdo status bot",
|
|
|
|
"version": "0.0.1",
|
|
|
|
"private": true,
|
|
|
|
"dependencies": {
|
2013-10-21 23:40:57 +00:00
|
|
|
"express": "3.4",
|
2013-10-14 19:26:54 +00:00
|
|
|
"connect-flash": "0.1.1",
|
2013-10-21 23:40:57 +00:00
|
|
|
"net-snmp": "1.1.8",
|
|
|
|
"redis": "0.8.5",
|
|
|
|
"underscore": "1.5.2",
|
2015-09-05 10:18:35 +00:00
|
|
|
"node-notifier": "^4.2.3",
|
2013-10-21 23:40:57 +00:00
|
|
|
"jade": "0.35",
|
|
|
|
"socket.io": "0.9.16",
|
|
|
|
"moment": "2.3.1"
|
2013-10-02 12:04:01 +00:00
|
|
|
},
|
2013-10-08 20:13:20 +00:00
|
|
|
"main": "index"
|
2015-09-05 11:57:25 +00:00
|
|
|
=======
|
2015-09-05 10:18:35 +00:00
|
|
|
"name": "statusbot",
|
|
|
|
"description": "ctdo status bot",
|
|
|
|
"version": "0.0.1",
|
|
|
|
"private": true,
|
|
|
|
"dependencies": {
|
|
|
|
"connect-flash": "0.1.1",
|
|
|
|
"express": "3.4",
|
|
|
|
"jade": "0.35",
|
|
|
|
"moment": "2.3.1",
|
|
|
|
"net-snmp": "1.1.8",
|
|
|
|
"node-notifier": "^4.2.3",
|
|
|
|
"redis": "0.8.5",
|
|
|
|
"socket.io": "0.9.16",
|
|
|
|
"underscore": "1.5.2"
|
|
|
|
},
|
|
|
|
"main": "index"
|
2015-09-05 11:57:25 +00:00
|
|
|
>>>>>>> 200046b0f183420dd23f391720a740607a1ec288
|
2013-10-02 12:04:01 +00:00
|
|
|
}
|