removes merge conflicts in tine20/Courses/translations/de.po
[tine20] / tine20 / Tool /
drwxr-xr-x   ..
drwxr-xr-x - CodeGenerator