diff options
| author | Kristian Aune <kraune@verizonmedia.com> | 2022-06-16 15:46:50 +0200 |
|---|---|---|
| committer | Kristian Aune <kraune@verizonmedia.com> | 2022-06-16 15:46:50 +0200 |
| commit | 0ab2071f92d1b181c12dabb8c53c4653c09645c8 (patch) | |
| tree | 9be0107f29a21d276165f27dc7ab7ac7b0a259c5 /container-integration-test | |
| parent | cb2180e9d2d2411832521f00e1ae1ad9e44026d6 (diff) | |
| parent | 69a3890ae5292eaaa527976c43535373d489ab00 (diff) | |
Resolve merge conflict
Diffstat (limited to 'container-integration-test')
| -rw-r--r-- | container-integration-test/pom.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/container-integration-test/pom.xml b/container-integration-test/pom.xml index 5a0bee3b03b..d38ca130fdb 100644 --- a/container-integration-test/pom.xml +++ b/container-integration-test/pom.xml @@ -8,12 +8,12 @@ <parent> <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> - <version>7-SNAPSHOT</version> + <version>8-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>container-integration-test</artifactId> <packaging>jar</packaging> - <version>7-SNAPSHOT</version> + <version>8-SNAPSHOT</version> <dependencies> <dependency> <groupId>com.yahoo.vespa</groupId> |