From 93b61cd5116d829410c485bdfd79dbb3cbc2ef0f Mon Sep 17 00:00:00 2001
From: Karan Khanna <krnkhanna1989@gmail.com>
Date: Sun, 20 May 2018 14:35:11 +0200
Subject: [PATCH] resolve merge conflicts

---
 javax-servlets/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/javax-servlets/pom.xml b/javax-servlets/pom.xml
index 5adc9da0b9..a33701fda9 100644
--- 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>