removes merge conflicts in tine20/Courses/translations/de.po
[tine20] / bin /
drwxr-xr-x   ..
-rw-r--r-- 1897 tn.php