Remove accidentally committed conflicts in spec file. 0.1.4 accepted/tizen/20130808.175547 submit/tizen/20130808.105344
-rw-r--r-- 241 .gitignore
-rw-r--r-- 552 .gitmodules
-rw-r--r-- 9198 COPYING
-rw-r--r-- 140 Changelog
-rw-r--r-- 7404 Gruntfile.js
-rw-r--r-- 378 LICENSES
-rw-r--r-- 171 Makefile
-rw-r--r-- 883 README.md
drwxr-xr-x - dist
drwxr-xr-x - docs
-rw-r--r-- 37 env.sh
drwxr-xr-x - images
drwxr-xr-x - lib
-rw-r--r-- 1637 package.json
drwxr-xr-x - packaging
drwxr-xr-x - src
drwxr-xr-x - tests