Merge the conflict
[vuplus_openembedded] / opie-today-weatherplugin / opie-today-weatherplugin_1.1.7.oe