summaryrefslogtreecommitdiffstats
path: root/archiva-modules
diff options
context:
space:
mode:
authorJevica Arianne B. Zurbano <jzurbano@apache.org>2011-01-25 06:45:31 +0000
committerJevica Arianne B. Zurbano <jzurbano@apache.org>2011-01-25 06:45:31 +0000
commit13609a81fe50ce2f3247087e73798b6c0db768da (patch)
tree2b55b148bbb4b448784ab0b3d493fb4caf291f98 /archiva-modules
parent605c1db826c30cdf5d4347dd9b401032a10ebc0e (diff)
downloadarchiva-13609a81fe50ce2f3247087e73798b6c0db768da.tar.gz
archiva-13609a81fe50ce2f3247087e73798b6c0db768da.zip
fixed typo
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1063154 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
-rw-r--r--archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java4
1 files changed, 2 insertions, 2 deletions
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 6b359ce1a..a0ef048b8 100644
--- 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
@@ -331,11 +331,11 @@ public class Maven2RepositoryMerger
List<ArtifactMetadata> sourceArtifacts = metadataRepository.getArtifacts( sourceRepo );
List<ArtifactMetadata> conflictsArtifacts = new ArrayList<ArtifactMetadata>();
- for ( ArtifactMetadata targerArtifact : targetArtifacts )
+ for ( ArtifactMetadata targetArtifact : targetArtifacts )
{
for ( ArtifactMetadata sourceArtifact : sourceArtifacts )
{
- if ( isEquals( targerArtifact, sourceArtifact ) )
+ if ( isEquals( targetArtifact, sourceArtifact ) )
{
if ( !conflictsArtifacts.contains( sourceArtifact ) )
{