Code

Added conflict with kolab
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Fri, 9 Jun 2006 04:54:01 +0000 (04:54 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Fri, 9 Jun 2006 04:54:01 +0000 (04:54 +0000)
commit8477e94d6c4536f3d04818bd0b8f9a70abb3383f
tree3a9c801bcafb4e2768e1f91717d72dff7196140c
parent0484ca8f0aa8fa6fdc90cb9419133365ed265bfb
Added conflict with kolab

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3723 594d385d-05f5-0310-b6e9-bd551577e9d8
plugins/admin/systems/class_goImapServer.inc
plugins/admin/systems/class_goMailServer.inc