Thanks a lot for your branch. I've noticed the diff contains unresolved merge conflicts that need to be resolved before the merge proposal can be accepted (see the ubuntu-weather-app.qml file).
Do you think you could fix them and commit the changes to your branch? This way the merge proposal will be updated with your fixes.
Hi Raúl,
Thanks a lot for your branch. I've noticed the diff contains unresolved merge conflicts that need to be resolved before the merge proposal can be accepted (see the ubuntu- weather- app.qml file).
Do you think you could fix them and commit the changes to your branch? This way the merge proposal will be updated with your fixes.
Thanks!