Merge the conflict

[vuplus_openembedded] / opie-bluepin / opie-bluepin_1.1.7.oe

diff --git a/opie-bluepin/opie-bluepin_1.1.7.oe b/opie-bluepin/opie-bluepin_1.1.7.oe
new file mode 100644 (file)
index 0000000..e69de29