From: Maria Odea B. Ching <oching@apache.org>
Date: Tue, 27 Jul 2010 06:31:40 +0000 (+0000)
Subject: fixed formatting
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=24396152ea6460b3ba6324561f00e3eec0c1ebeb;p=archiva.git

fixed formatting


git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@979553 13f79535-47bb-0310-9956-ffa450edef68
---

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;
     }