-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathpackage.json
More file actions
65 lines (65 loc) · 1.61 KB
/
Copy pathpackage.json
File metadata and controls
65 lines (65 loc) · 1.61 KB
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
53
54
55
56
57
58
59
60
61
62
63
64
65
<<<<<<< HEAD
{
"name": "mongo-scraper",
"version": "1.0.0",
"description": "",
"main": "server.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "git+https://github.com/TGoodson/mongoScraper.git"
},
"author": "Trevon Goodson",
"license": "ISC",
"bugs": {
"url": "https://github.com/TGoodson/mongoScraper/issues"
},
"homepage": "https://github.com/TGoodson/mongoScraper#readme",
"dependencies": {
"body-parser": "^1.17.2",
"bulma": "^0.5.1",
"cheerio": "^1.0.0-rc.2",
"express": "^4.15.4",
"express-handlebars": "^3.0.0",
"method-override": "^2.3.9",
"mongoose": "^4.11.7",
"morgan": "^1.8.2",
"request": "^2.81.0",
"request-promise-native": "^1.0.4"
}
}
=======
{
"name": "mongo-scraper",
"version": "1.0.0",
"description": "",
"main": "server.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "git+https://github.com/TGoodson/mongoScraper.git"
},
"author": "Trevon Goodson",
"license": "ISC",
"bugs": {
"url": "https://github.com/TGoodson/mongoScraper/issues"
},
"homepage": "https://github.com/TGoodson/mongoScraper#readme",
"dependencies": {
"body-parser": "^1.17.2",
"bulma": "^0.5.1",
"cheerio": "^1.0.0-rc.2",
"express": "^4.15.4",
"express-handlebars": "^3.0.0",
"method-override": "^2.3.9",
"mongoose": "^4.11.7",
"morgan": "^1.8.2",
"request": "^2.81.0",
"request-promise-native": "^1.0.4"
}
}
>>>>>>> 25477312db00ebd1f47914e0584ac42bd0803b7e