Fix invalid samples branch
This commit is contained in:
@@ -20,15 +20,9 @@
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<<<<<<< HEAD
|
||||
<java.version>17</java.version>
|
||||
<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
|
||||
<spring-cloud-release.version>2022.0.0-SNAPSHOT</spring-cloud-release.version>
|
||||
=======
|
||||
<java.version>1.8</java.version>
|
||||
<spring-cloud-contract.version>3.1.4-SNAPSHOT</spring-cloud-contract.version>
|
||||
<spring-cloud-release.version>2021.0.3-SNAPSHOT</spring-cloud-release.version>
|
||||
>>>>>>> 3.1.x
|
||||
<excludeBuildFolders>true</excludeBuildFolders>
|
||||
</properties>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user