From 15eae4c5247f7ef5658ff4732da1464692fe02d3 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 3 Oct 2014 09:52:42 +1000 Subject: [PATCH] test pull request builder setup --- .../stagerepository/merge/Maven2RepositoryMergerTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 08e0f01c09..d4455166f7 100644 --- 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 @@ -19,7 +19,7 @@ * under the License. */ -import junit.framework.TestCase; +mport junit.framework.TestCase; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.Configuration; import org.apache.archiva.configuration.ManagedRepositoryConfiguration; @@ -172,4 +172,4 @@ public void testMergeWithOutConflictArtifacts() verify( metadataRepository ).getArtifacts( TEST_REPO_ID ); } -} \ No newline at end of file +}