diff options
| author | Marvin Bertin <marvin.bertin@gmail.com> | 2017-10-10 11:54:20 -0700 |
|---|---|---|
| committer | Marvin Bertin <marvin.bertin@gmail.com> | 2017-10-10 11:54:20 -0700 |
| commit | 19a70318ecee81872fffe23c03d83e725610911d (patch) | |
| tree | 984510310c95856fcdcb463d9a242f9773795266 /build.sbt | |
| parent | 05aa114cfd22228f0457b6457ce441af5eabfc60 (diff) | |
| parent | 4f83461cba1f78e607ca2a4edb6fa26f6e16e732 (diff) | |
| download | rest-query-19a70318ecee81872fffe23c03d83e725610911d.tar.gz rest-query-19a70318ecee81872fffe23c03d83e725610911d.tar.bz2 rest-query-19a70318ecee81872fffe23c03d83e725610911d.zip | |
fix merge conflicts with master
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", |