added margins to delete conflict dialog
tree66585a395b4a9fbede9cad0cef5d437e2892c48b
-rw-r--r-- 628 .gitignore
-rw-r--r-- 543 .gitmodules
drwxr-xr-x - Languages
-rw-r--r-- 3425 build.txt
drwxr-xr-x - common
drwxr-xr-x - contrib
drwxr-xr-x - doc
drwxr-xr-x - ext
-rw-r--r-- 145 release.txt
drwxr-xr-x - src
drwxr-xr-x - test