[Tizen] Fix merge conflict on previous commit accepted/tizen/5.0/unified/20181126.062105 submit/tizen_5.0/20181122.071848 submit/tizen_5.0/20181122.121626 submit/tizen_5.0/20181123.054101
-rw-r--r-- 10237 LICENSE
drwxr-xr-x - build
-rw-r--r-- 67 dali-extension.manifest
drwxr-xr-x - dali-extension
drwxr-xr-x - packaging
drwxr-xr-x - scripts