From 9a7e3688e407febec5c5ab05d3c7ff432c4f9025 Mon Sep 17 00:00:00 2001 From: vlad Date: Thu, 25 May 2017 17:05:23 -0700 Subject: 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 --- src/main/scala/xyz/driver/core/rest.scala | 1 - 1 file changed, 1 deletion(-) (limited to 'src/main/scala/xyz/driver/core/rest.scala') 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._ -- cgit v1.2.3