From fb9ab071a5843bb043e39596ce2b41fb30ed27d7 Mon Sep 17 00:00:00 2001
From: Karan Khanna <krnkhanna1989@gmail.com>
Date: Sun, 20 May 2018 13:34:18 +0200
Subject: [PATCH] resolve merge confilct

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

diff --git a/javax-servlets/pom.xml b/javax-servlets/pom.xml
index 4f9e18a900..3970b392f2 100644
--- a/javax-servlets/pom.xml
+++ b/javax-servlets/pom.xml
@@ -18,11 +18,6 @@
 			<artifactId>javax.servlet-api</artifactId>
 			<version>${javax.servlet.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>${gson.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
@@ -35,6 +30,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>