Fixing merge conflict in pom.xml

This commit is contained in:
Andrew B 2015-08-19 23:08:49 -07:00
parent 7a92f53b55
commit fb4c62cc28

View File

@ -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>