Merge the conflict

[vuplus_openembedded] / opie-qasteroids / opie-qasteroids_1.1.6.oe

diff --git a/opie-qasteroids/opie-qasteroids_1.1.6.oe b/opie-qasteroids/opie-qasteroids_1.1.6.oe
deleted file mode 100644 (file)
index e69de29..0000000