Added Keep Local, Keep Server conflict resolution actions
-rw-r--r-- 982 .gitgnore
drwxr-xr-x - trunk