From 45df84aa8fc60ab493d2c195e608a3b0d2a87046 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Wed, 11 Mar 2009 02:34:05 +0000 Subject: [PATCH] Merged V3.1 to HEAD 12992: Merged V3.0 to V3.1 12930: Merged V2.2 to V3.0 12713: Fix one part of ETWOTWO-975 (submit conflicts silently fail) ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V3.0:r12930 Merged /alfresco/BRANCHES/V2.2:r12713 Merged /alfresco/BRANCHES/V3.1:r12992 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13548 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/web/bean/wcm/SubmitDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java index e063b3b242..37f7377edd 100644 --- a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java @@ -523,7 +523,7 @@ public class SubmitDialog extends BaseDialogBean } // write changes to layer so files are marked as modified - getAvmSyncService().update(diffs, null, true, true, false, false, null, null); + getAvmSyncService().update(diffs, null, false, false, false, false, null, null); } /**