![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | rettenbe <rettenbe@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Wed, 12 Nov 2008 13:32:58 +0000 (13:32 +0000) | ||
| committer | rettenbe <rettenbe@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Wed, 12 Nov 2008 13:32:58 +0000 (13:32 +0000) | ||
| commit | d0ff77b13e20c3d6532dfe9f7f028af771d8327e | |
| tree | c0c4c018f1475f5eee603f1b78b0a9cd12fbd59d | tree | snapshot |
| parent | f970ba2c0742d5ad248674f3ba5d95745bd0cfe5 | commit | diff |
delete conflict ">>>>>>>"
git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13010 594d385d-05f5-0310-b6e9-bd551577e9d8
git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13010 594d385d-05f5-0310-b6e9-bd551577e9d8
| gosa-si/gosa-si-server | diff | blob | history |