Merge the conflict
[vuplus_openembedded] / opie-cardmon / opie-cardmon_1.1.7.oe