Merge the conflict
[vuplus_openembedded] / opie-tictac /
drwxr-xr-x   ..
-rw-r--r-- 0 opie-tictac_1.1.7.oe
-rw-r--r-- 725 opie-tictac_cvs.oe