restore @Test annotation which was not here

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1214953 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java b/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java
index 4ec9674674ba6463de0edd2fee41a46ad9d23a38..00167dc34b36cd8ee39b6759fdd18767fb772601 100644 (file)
--- a/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java
+++ b/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java
@@ -106,6 +106,7 @@ public class Maven2RepositoryMergerTest
         verify( metadataRepository ).getArtifacts( TEST_REPO_ID );
     }
 
+    @Test
     public void testMergeWithOutConflictArtifacts()
         throws Exception
     {