Thanks, happy to finally see this branch unblocked for you!
A few comments inline:
60 +<<<<<<< TREE
- It seems that the branch has merge conflicts that need to be resolved before landing
- I've made a couple of minor fixes based on this branch here [1]. These should not stop this branch from landing, though.
- I've not forgotten about your question about icon codes for TWC. I've got that info now and I'll submit it as a separate MP :)
- As a further feature, we should print a message if the key.js file is empty, to let developers know what they have to do to use the key (e.g. console.log("The TWC API requires a key. Contact Alan Pope <e-mail> for developer access to the key.")). But we can do this in a separate MP
In summary, there is only one issue that needs to be addressed (the merge conflicts) before landing this.
Thanks, happy to finally see this branch unblocked for you!
A few comments inline:
60 +<<<<<<< TREE
- It seems that the branch has merge conflicts that need to be resolved before landing
- I've made a couple of minor fixes based on this branch here [1]. These should not stop this branch from landing, though.
- I've not forgotten about your question about icon codes for TWC. I've got that info now and I'll submit it as a separate MP :)
- As a further feature, we should print a message if the key.js file is empty, to let developers know what they have to do to use the key (e.g. console.log("The TWC API requires a key. Contact Alan Pope <e-mail> for developer access to the key.")). But we can do this in a separate MP
In summary, there is only one issue that needs to be addressed (the merge conflicts) before landing this.
[1] https:/ /code.launchpad .net/~dpm/ ubuntu- weather- app/minor- weather- api-improv/ +merge/ 205753