jdorfman / awesome-json-datasets

A curated list of awesome JSON datasets that don't require authentication.

Creative Commons Zero v1.0 Universal

3.33k stars 376 forks source link

Added some car brands #106

Closed pliguori closed 8 years ago

pliguori commented 8 years ago

21

hedavies98 commented 8 years ago

If you can fix the conflict I can merge.

jdorfman commented 8 years ago

I am having no luck fixing this.

> git checkout -b pliguori-#21-new-jsons master
Switched to a new branch 'pliguori-#21-new-jsons'
 ~/github/jdorfman/Awesome-JSON-Datasets  ± (pliguori-#21-new-jsons ✓)

> git pull https://github.com/pliguori/awesome-json-datasets.git #21-new-jsons
From https://github.com/pliguori/awesome-json-datasets
 * branch            HEAD       -> FETCH_HEAD
Already up-to-date.

jdorfman commented 8 years ago

Hey @pliguori please make an individual pull request for each suggestion. Closing this, please resubmit. =)

This rule wasn't present when you made the pull request, but I have to enforce it to minimize conflicts. Thanks