aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientdefiningcriteria.scala
diff options
context:
space:
mode:
authorAleksandr <ognelisar@gmail.com>2017-10-10 16:41:33 +0700
committerAleksandr <ognelisar@gmail.com>2017-10-10 16:41:33 +0700
commit4c22afe6a34641f5b35ff4953a5821a2bc940255 (patch)
tree4f77275d4460a184cf64085e9d7597841a50fbc9 /src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientdefiningcriteria.scala
parentc32f965212481e4d26c2ae1ae5616f2d4b3e22ae (diff)
parent4f83461cba1f78e607ca2a4edb6fa26f6e16e732 (diff)
downloadrest-query-4c22afe6a34641f5b35ff4953a5821a2bc940255.tar.gz
rest-query-4c22afe6a34641f5b35ff4953a5821a2bc940255.tar.bz2
rest-query-4c22afe6a34641f5b35ff4953a5821a2bc940255.zip
All merge conflicts are resolved
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientdefiningcriteria.scala')
-rw-r--r--src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientdefiningcriteria.scala1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientdefiningcriteria.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientdefiningcriteria.scala
index 0520ef2..746c7b4 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientdefiningcriteria.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientdefiningcriteria.scala
@@ -2,6 +2,7 @@ package xyz.driver.pdsuidomain.formats.json.sprayformats
import spray.json._
import xyz.driver.pdsuidomain.entities.PatientLabel
+import xyz.driver.formats.json.labels._
object patientdefiningcriteria {
import DefaultJsonProtocol._