resolve merge conflicts

2018-05-20 14:35:11 +02:00 · 2018-05-20 14:35:11 +02:00 · 93b61cd511
parent 675f346e3d
commit 93b61cd511
1 changed files with 5 additions and 0 deletions
--- a/javax-servlets/pom.xml
+++ b/javax-servlets/pom.xml
@ -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>