Refactored: Move conflict resolve code to CAppUtils
tree6d4334aa798c6fbedb9ef0c425377e82e4a18408
-rw-r--r-- 429 .gitignore
-rw-r--r-- 679 .gitmodules
-rw-r--r-- 224 .mailmap
-rw-r--r-- 255 .tgitconfig
drwxr-xr-x - Languages
-rw-r--r-- 2878 build.txt
drwxr-xr-x - contrib
drwxr-xr-x - doc
drwxr-xr-x - ext
-rw-r--r-- 952 release.txt
drwxr-xr-x - src
drwxr-xr-x - test