svn commit: r979553 - /archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java

[oching]

Author: oching
Date: Tue Jul 27 06:31:40 2010
New Revision: 979553

URL: http://svn.apache.org/viewvc?rev=979553&view=rev
Log:
fixed formatting

Modified:
    
archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java

Modified: 
archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java
URL: 
http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java?rev=979553&r1=979552&r2=979553&view=diff
==============================================================================
--- 
archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java
 (original)
+++ 
archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java
 Tue Jul 27 06:31:40 2010
@@ -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;
     }