| commit | 54b2a5f5dbfb8c4713229fbc7541055325d522ac | [log] [tgz] |
|---|---|---|
| author | Cowtowncoder <tatu.saloranta@iki.fi> | Fri Apr 24 15:39:39 2015 -0700 |
| committer | Cowtowncoder <tatu.saloranta@iki.fi> | Fri Apr 24 15:39:39 2015 -0700 |
| tree | c9af31c8ed356521d4d916afefd13d3512e06c26 | |
| parent | 966729c787ffdb08e99318f9c7c18dde8357faf9 [diff] |
...
diff --git a/pom.xml b/pom.xml index 4e7668a..0eca2f4 100644 --- a/pom.xml +++ b/pom.xml
@@ -74,11 +74,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> -<<<<<<< HEAD <version>2.6.0-SNAPSHOT</version> -======= - <version>2.5.3</version> ->>>>>>> 2.5 </dependency> <!-- and for testing we need a few libraries