Resolve conflicts
[idea/community.git] / python / educational-python / resources / fileTemplates /
drwxr-xr-x   ..
drwxr-xr-x - internal