[git-index] rename GitAcceptConflictSideAction file to GitConflictActions
[idea/community.git] / community-resources /
drwxr-xr-x   ..
-rw-r--r-- 1132 intellij.idea.community.resources.iml
drwxr-xr-x - src