From fb4c62cc28ed4c486feb40b4ca586e43c34bcfb8 Mon Sep 17 00:00:00 2001
From: Andrew B <who@users.noreply.github.com>
Date: Wed, 19 Aug 2015 23:08:49 -0700
Subject: [PATCH] Fixing merge conflict in pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ce59ad54f41..45fba414722 100644
--- a/pom.xml
+++ b/pom.xml
@@ -456,7 +456,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>1.0.9</swagger-parser-version>
+        <swagger-parser-version>1.0.9-SNAPSHOT</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>2.3.4</felix-version>
         <swagger-core-version>1.5.0</swagger-core-version>