improve message, validate pluginRepositories as well

apache · May 18, 2024 · f32e0cb · f32e0cb
1 parent 1d0ca63
commit f32e0cb
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/...-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/...-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
@@ -41,10 +41,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-<<<<<<< Upstream, based on master
 import java.util.stream.StreamSupport;
-=======
->>>>>>> 4f3fe69 [MNG-8050] emit warn in case of repo id clashes between settings and POM
 
 import org.apache.maven.api.model.Activation;
 import org.apache.maven.api.model.ActivationFile;