summaryrefslogtreecommitdiffstats
path: root/defaults
diff options
context:
space:
mode:
authorgjoranv <gjoranv@gmail.com>2017-11-29 15:06:46 +0100
committerGitHub <noreply@github.com>2017-11-29 15:06:46 +0100
commit1c5eb1dafb6419158cf848d5acfea62d0a5824fc (patch)
tree3a25378c030f8f2ac9b6442708bdc7c2a000ca12 /defaults
parent166ce7c53a96f733d5e1b909bc8b465a2f8d70ec (diff)
Revert "Gjoranv/split parent"
Diffstat (limited to 'defaults')
-rw-r--r--defaults/pom.xml7
1 files changed, 3 insertions, 4 deletions
diff --git a/defaults/pom.xml b/defaults/pom.xml
index 1a184f46396..2f3f06780e7 100644
--- a/defaults/pom.xml
+++ b/defaults/pom.xml
@@ -5,10 +5,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>com.yahoo.vespa</groupId>
- <artifactId>parent</artifactId>
- <version>6-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
+ <groupId>com.yahoo.vespa</groupId>
+ <artifactId>parent</artifactId>
+ <version>6-SNAPSHOT</version>
</parent>
<groupId>com.yahoo.vespa</groupId>
<artifactId>defaults</artifactId>