Code

Added conflict values
authorcajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 1 Jun 2006 16:09:32 +0000 (16:09 +0000)
committercajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 1 Jun 2006 16:09:32 +0000 (16:09 +0000)
commit08ec53c02e7fc810650688048791c36cbbba0f8c
tree23e4cde24f17c6510ec6e9ce26cca75ad00d157c
parentda8336792b57d0184a7d4f95e197f4c7f66d8fb8
Added conflict values

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3610 594d385d-05f5-0310-b6e9-bd551577e9d8
include/class_plugin.inc