Commit a113c7d
committed
Merge remote-tracking branch 'origin/4.3.x'
Signed-off-by: Olga Maciaszek-Sharma <[email protected]>
# Conflicts:
# docker/spring-cloud-contract-docker/project/gradle.properties
# pom.xml
# spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties
# spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties
# spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml1 file changed
+1
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
0 commit comments