[git-index] rename GitAcceptConflictSideAction file to GitConflictActions
[idea/community.git] / resources-en /
drwxr-xr-x   ..
-rw-r--r-- 7 icon-robots.txt
-rw-r--r-- 444 intellij.java.resources.en.iml
drwxr-xr-x - src