Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Cleaning post merge remnants

POM had some merge problem, and moving newly added
stuff to their proper place
  • Loading branch information...
commit 9fdb057886287a9b387290d02f8ffb627ad79353 1 parent c69aaec
@cstamas cstamas authored
View
3  nexus/nexus-core/pom.xml
@@ -13,10 +13,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-<<<<<<< HEAD:nexus/nexus-core/pom.xml
-=======
->>>>>>> origin/master:nexus/nexus-proxy/pom.xml
<modelVersion>4.0.0</modelVersion>
<parent>
View
0  ...e/remote/httpclient/InterruptableInputStream.java → ...e/remote/httpclient/InterruptableInputStream.java
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.