Skip to content

Commit

Permalink
Merge pull request #322 from pelias/master
Browse files Browse the repository at this point in the history
Merge master into staging
  • Loading branch information
orangejulius authored Aug 6, 2018
2 parents df2b514 + dbf33e3 commit a351966
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
>This repository is part of the [Pelias](http://pelias.io)
>project. Pelias is an open-source, open-data geocoder built by
>[Mapzen](https://www.mapzen.com/) that also powers [Mapzen Search](https://mapzen.com/projects/search). Our
>official user documentation is [here](https://mapzen.com/documentation/search/).
>This repository is part of the [Pelias](https://github.com/pelias/pelias)
>project. Pelias is an open-source, open-data geocoder originally sponsored by
>[Mapzen](https://www.mapzen.com/). Our official user documentation is
>[here](https://github.com/pelias/documentation).
# Pelias Geonames importer

Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,26 +45,26 @@
"csv-parse": "^2.0.2",
"geonames-stream": "^2.0.3",
"lodash": "^4.2.1",
"pelias-config": "3.0.2",
"pelias-config": "^3.0.2",
"mkdirp": "^0.5.1",
"pelias-dbclient": "2.5.6",
"pelias-logger": "0.4.2",
"pelias-model": "5.5.2",
"pelias-wof-admin-lookup": "4.6.5",
"pelias-dbclient": "^2.5.6",
"pelias-logger": "^0.4.2",
"pelias-model": "^5.5.2",
"pelias-wof-admin-lookup": "^4.6.5",
"request": "^2.34.0",
"through2": "^2.0.1",
"through2-filter": "^2.0.0",
"through2-filter": "^3.0.0",
"through2-sink": "^1.0.0",
"unzipper": "^0.8.3"
},
"devDependencies": {
"deep-diff": "^1.0.0",
"event-stream": "^3.3.2",
"pelias-mock-logger": "^1.1.0",
"precommit-hook": "3.0.0",
"precommit-hook": "^3.0.0",
"proxyquire": "^2.0.0",
"semantic-release": "^15.0.0",
"tap-dot": "^1.0.1",
"tap-dot": "^2.0.0",
"tape": "^4.4.0"
},
"pre-commit": [
Expand Down

0 comments on commit a351966

Please sign in to comment.