diff options
| author | vlad <vlad@driver.xyz> | 2017-05-25 17:05:23 -0700 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-05-25 17:05:23 -0700 |
| commit | 9a7e3688e407febec5c5ab05d3c7ff432c4f9025 (patch) | |
| tree | 0a208f27f52317927a325d1cb4eb361b97a09b7b /src/main/scala/xyz/driver/core/rest.scala | |
| parent | a89dc9e25b0174baae6ffab9b9211630fcb522d5 (diff) | |
| download | driver-core-9a7e3688e407febec5c5ab05d3c7ff432c4f9025.tar.gz driver-core-9a7e3688e407febec5c5ab05d3c7ff432c4f9025.tar.bz2 driver-core-9a7e3688e407febec5c5ab05d3c7ff432c4f9025.zip | |
Merge branch 'master' of https://github.com/drivergroup/driver-core into service-dependencies
# Conflicts:
# src/main/scala/xyz/driver/core/app.scala
# src/main/scala/xyz/driver/core/rest.scala
Diffstat (limited to 'src/main/scala/xyz/driver/core/rest.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/core/rest.scala | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/scala/xyz/driver/core/rest.scala b/src/main/scala/xyz/driver/core/rest.scala index d4425fe..cbd671e 100644 --- a/src/main/scala/xyz/driver/core/rest.scala +++ b/src/main/scala/xyz/driver/core/rest.scala @@ -21,7 +21,6 @@ import akka.util.ByteString import com.github.swagger.akka.model._ import com.github.swagger.akka.{HasActorSystem, SwaggerHttpService} import com.typesafe.config.Config -import com.typesafe.scalalogging.Logger import io.swagger.models.Scheme import pdi.jwt.{Jwt, JwtAlgorithm} import xyz.driver.core.auth._ |