From 24396152ea6460b3ba6324561f00e3eec0c1ebeb Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Tue, 27 Jul 2010 06:31:40 +0000 Subject: [PATCH] fixed formatting git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@979553 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/maven/archiva/web/action/MergeAction.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java index b50bf0ac9..542a8ecee 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java @@ -121,9 +121,7 @@ public class MergeAction for ( ArtifactMetadata metadata : sourceArtifacts ) { - triggerAuditEvent( targetRepoId, metadata.getId(), AuditEvent.MERGING_REPOSITORIES ); -// } return SUCCESS; @@ -147,6 +145,7 @@ public class MergeAction { return ERROR; } + return SUCCESS; } -- 2.39.5