steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php, 1.17, 1.18

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv14881/kolab-resource-handlers/resmgr

Modified Files:
	resmgr.php 
Log Message:
dont send tentative

Index: resmgr.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- resmgr.php	9 Sep 2004 13:03:16 -0000	1.17
+++ resmgr.php	11 Sep 2004 01:55:43 -0000	1.18
@@ -845,8 +845,9 @@
 
             if ($conflict) {
                 if ($params['action'] == RM_ACT_MANUAL_IF_CONFLICTS) {
-                    myLog("Conflict detected; tentatively accepting");
-                    sendITipReply(RM_ITIP_TENTATIVE);
+		    //myLog("Conflict detected; tentatively accepting");
+		    //sendITipReply(RM_ITIP_TENTATIVE);
+		    myLog("Conflict detected; Passing mail through");
                     break;
                 } else if ($params['action'] == RM_ACT_REJECT_IF_CONFLICTS) {
                     myLog("Conflict detected; rejecting");