fixed formatting

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

diff --git a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
index ca71277e6480e95d6030ac5af5aa575f8d5987a3..7b8fe7b866416a8f87ae3c02741b7eadde95fcc0 100644 (file)
--- a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
+++ b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
@@ -226,7 +226,6 @@ public class Maven2RepositoryMerger
     private void copyFile( File sourceFile, File targetFile )
         throws IOException
     {
-
         FileOutputStream out = new FileOutputStream( targetFile );
         FileInputStream input = new FileInputStream( sourceFile );
 
@@ -329,27 +328,21 @@ public class Maven2RepositoryMerger
     public List<ArtifactMetadata> getConflictsartifacts( String sourceRepo, String targetRepo )
         throws Exception
     {
-
         List<ArtifactMetadata> targetArtifacts = metadataRepository.getArtifacts( targetRepo );
         List<ArtifactMetadata> sourceArtifacts = metadataRepository.getArtifacts( sourceRepo );
         List<ArtifactMetadata> conflictsArtifacts = new ArrayList<ArtifactMetadata>();
 
         for ( ArtifactMetadata targerArtifact : targetArtifacts )
         {
-
             for ( ArtifactMetadata sourceArtifact : sourceArtifacts )
             {
-
                 if ( isEquals( targerArtifact, sourceArtifact ) )
                 {
                     if ( !conflictsArtifacts.contains( sourceArtifact ) )
                     {
                         conflictsArtifacts.add( sourceArtifact );
-
                     }
-
                 }
-
             }
         }