resolve merge conflicts

This commit is contained in:
Karan Khanna 2018-05-20 14:35:11 +02:00
parent 675f346e3d
commit 93b61cd511
1 changed files with 5 additions and 0 deletions

View File

@ -58,6 +58,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>