Set result text before selecting result when conflict status is 85/119285/1
-rwxr-xr-x 804 502.vc_upgrade_24to30.sh
-rw-r--r-- 139 AUTHORS
-rw-r--r-- 2475 CMakeLists.txt
-rw-r--r-- 11358 LICENSE
-rw-r--r-- 221 NOTICE
-rw-r--r-- 5407 changelog
drwxr-xr-x - client
drwxr-xr-x - common
drwxr-xr-x - doc
drwxr-xr-x - include
-rw-r--r-- 70 org.tizen.voice.vcserver.service
drwxr-xr-x - packaging
drwxr-xr-x - server
-rw-r--r-- 220 vc-config.xml
-rw-r--r-- 1764 vc-server.conf