git merge conflicts in forecast.io.js

iantearle / darksky.net-javascript-api

Darksky.net Javascript API

http://iantearle.com

65 stars 33 forks source link

git merge conflicts in forecast.io.js #14

Closed rjbultitude closed 8 years ago

rjbultitude commented 8 years ago

Hi Ian

It looks like the recent merge of my fork into yours has conflicts. In the main forecast.io.js file there's merge conflict markers on lines 46, 59, 100 and 259 which breaks the script.

rjbultitude commented 8 years ago

Further to the above there are merge conflict markers in the index file too. Happy to fix if you want to grant me full access

iantearle commented 8 years ago

Hi Rich, yeah, sorry - had a nightmare merging in - not even sure, hadn't had time to fix. Thanks for the offer. You should be now set as a collaborator.