removes conflict marker
[tine20] / tine20 / Tinebase / User /
drwxr-xr-x   ..
-rw-r--r-- 20558 Abstract.php
-rw-r--r-- 22174 ActiveDirectory.php
-rw-r--r-- 1980 Interface.php
drwxr-xr-x - Interface
-rw-r--r-- 36176 Ldap.php
drwxr-xr-x - LdapPlugin
drwxr-xr-x - Plugin
-rw-r--r-- 44791 Sql.php
-rw-r--r-- 8339 Typo3.php