removes merge conflicts in tine20/Courses/translations/de.po
[tine20] / tine20 / Tool / CodeGenerator /
drwxr-xr-x   ..
-rw-r--r-- 7361 Application.php
-rw-r--r-- 437 Interface.php