Github user michael-o commented on the pull request:
https://github.com/apache/maven/pull/70#issuecomment-159366801
@barthel Git gives me:
> git merge --no-commit barthel/MNG-3092
Auto-merging
maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
CONFLICT (content): Merge conflict in
maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
Automatic merge failed; fix conflicts and then commit the result.
Can you resolve and push again to this branch?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
For additional commands, e-mail: dev-h...@maven.apache.org
