resolve merge conflicts

This commit is contained in:
amit.pandey
2020-01-30 02:39:31 +05:30
22 changed files with 97 additions and 49 deletions

View File

@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>${spring-boot-version}</version>
<version>${spring.boot.starter.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
@@ -88,6 +88,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<start-class>com.baeldung.springdatageode.app.ClientCacheApp</start-class>
<spring-geode-starter-version>1.1.1.RELEASE</spring-geode-starter-version>
<spring.boot.starter.version>2.1.9.RELEASE</spring.boot.starter.version>
</properties>
</project>