diff options
| author | Aleksandr <ognelisar@gmail.com> | 2017-10-10 16:41:33 +0700 |
|---|---|---|
| committer | Aleksandr <ognelisar@gmail.com> | 2017-10-10 16:41:33 +0700 |
| commit | 4c22afe6a34641f5b35ff4953a5821a2bc940255 (patch) | |
| tree | 4f77275d4460a184cf64085e9d7597841a50fbc9 /build.sbt | |
| parent | c32f965212481e4d26c2ae1ae5616f2d4b3e22ae (diff) | |
| parent | 4f83461cba1f78e607ca2a4edb6fa26f6e16e732 (diff) | |
| download | rest-query-4c22afe6a34641f5b35ff4953a5821a2bc940255.tar.gz rest-query-4c22afe6a34641f5b35ff4953a5821a2bc940255.tar.bz2 rest-query-4c22afe6a34641f5b35ff4953a5821a2bc940255.zip | |
All merge conflicts are resolved
Diffstat (limited to 'build.sbt')
| -rw-r--r-- | build.sbt | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -18,8 +18,8 @@ lazy val core = (project in file(".")) "io.github.cloudify" %% "spdf" % "1.4.0", "org.davidbild" %% "tristate-core" % "0.2.0", "org.davidbild" %% "tristate-play" % "0.2.0" exclude ("com.typesafe.play", "play-json"), - "xyz.driver" %% "core" % "1.2.1", - "xyz.driver" %% "domain-model" % "0.17.5", + "xyz.driver" %% "core" % "1.2.2", + "xyz.driver" %% "domain-model" % "0.17.8", "ch.qos.logback" % "logback-classic" % "1.1.7", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.8.4", "com.github.spullara.mustache.java" % "scala-extensions-2.11" % "0.9.4", |