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

UK Environmental Agency #95

Closed stephan2307 closed 8 years ago

stephan2307 commented 8 years ago

Added 6 JSON endpoints for the UK Environmental agency

hedavies98 commented 8 years ago

You have some trailing spaces in your commit which is preventing the check from passing, make sure no lines end in a space and the check should pass.

stephan2307 commented 8 years ago

Updated

hedavies98 commented 8 years ago

If you move the datasets to be under weather instead of government, I'll merge.

stephan2307 commented 8 years ago

did the change but not sure what the conflict is now.

hedavies98 commented 8 years ago

I'll look into it.

hedavies98 commented 8 years ago

You still have a merge conflict, you can use the command line to fix it or open a new Pull Request that has the latest changes from master.

jdorfman commented 8 years ago

@stephan2307 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