fix conflict

[Open Black Hole Git]

fix conflict

• [DH] Makefile
• [DH] bitbake
• [DH] meta-formuler
• [DH] meta-hd
• [DH] meta-openembedded
• [DH] meta-vuplus
• [DH] meta-xp
• [DH] meta-xtrend
• [DH] openembedded-core

Author: dpeddi

Continue reading...