SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed broken merge

Browse Source
This commit is contained in:
Marcin Grzejszczak
2022-06-14 13:20:37 +02:00
parent a1947ba825
commit fa698f8e94
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/standalone/dsl/pom.xml
View File

@@ -7,11 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-samples-standalone</artifactId>
<<<<<<< HEAD
<version>4.0.0-SNAPSHOT</version>
=======
<version>3.1.4-SNAPSHOT</version>
>>>>>>> 3.1.x
<relativePath>..</relativePath>
</parent>
@@ -23,11 +19,7 @@
</description>
<properties>
<<<<<<< HEAD
<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
=======
<spring-cloud-contract.version>3.1.4-SNAPSHOT</spring-cloud-contract.version>
>>>>>>> 3.1.x
</properties>
<modules>