aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/eligibility.scala
diff options
context:
space:
mode:
authorMarvin Bertin <marvin.bertin@gmail.com>2017-10-10 17:17:18 -0700
committerMarvin Bertin <marvin.bertin@gmail.com>2017-10-10 17:17:18 -0700
commitb124608a4faa9cb94474f27c1d4605e5cb0ab63d (patch)
treec3439f756f023facbbae4deea1972ad2f511dda3 /src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/eligibility.scala
parentf55212361d6126a05075a1f00f3915484b4f334e (diff)
parent385a9a99e5a95c3d623cddd927c37564e32dbd2d (diff)
downloadrest-query-b124608a4faa9cb94474f27c1d4605e5cb0ab63d.tar.gz
rest-query-b124608a4faa9cb94474f27c1d4605e5cb0ab63d.tar.bz2
rest-query-b124608a4faa9cb94474f27c1d4605e5cb0ab63d.zip
fix merge conflictsv0.7.5
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/eligibility.scala')
-rw-r--r--src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/eligibility.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/eligibility.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/eligibility.scala
index b836e1c..3c2465f 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/eligibility.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/eligibility.scala
@@ -21,7 +21,7 @@ object eligibility {
implicit val clinicalDocumentFormat: RootJsonFormat[ClinicalEvidenceDocument] = jsonFormat7(ClinicalEvidenceDocument)
implicit val evidenceDocumentFormat: RootJsonFormat[EvidenceDocument] =
- GadtJsonFormat.create[EvidenceDocument]("documentType") {
+ GadtJsonFormat.create[EvidenceDocument]("evidenceDocumentType") {
case _: MolecularEvidenceDocument => "Molecular"
case _: ClinicalEvidenceDocument => "Clinical"
} {