fix merge conflicts with master

1 files changed, 0 insertions, 32 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/RawTrialLabel.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/RawTrialLabel.scala
deleted file mode 100644
index bdbc4ea..0000000
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/RawTrialLabel.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package xyz.driver.pdsuidomain.entities
-
-import java.time.LocalDateTime
-
-import xyz.driver.entities.labels.Label
-import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId}
-import xyz.driver.pdsuicommon.logging._
-
-final case class RawTrialLabel(nctId: StringId[Trial],
-                               trialId: UuidId[Trial],
-                               condition: String,
-                               lastReviewed: LocalDateTime,
-                               armName: String,
-                               armId: LongId[Arm],
-                               labelId: LongId[Label],
-                               value: Option[Boolean],
-                               criterionId: LongId[Criterion],
-                               criteria: String,
-                               criterionArmId: LongId[Arm],
-                               isCompound: Boolean,
-                               isDefining: Boolean)
-
-object RawTrialLabel {
-
-  implicit def toPhiString(x: RawTrialLabel): PhiString = {
-    import x._
-    phi"RawTrialLabel(nctId=$nctId, trialId=$trialId, condition=${Unsafe(condition)}, lastReviewed=$lastReviewed, " +
-      phi"armId=$armId, armName=${Unsafe(armName)}, labelId=$labelId, value=$value, " +
-      phi"criterionId=$criterionId, criteria=${Unsafe(criteria)}, criterionArmId=$criterionArmId, " +
-      phi"isCompound=$isCompound, isDefining=$isDefining)"
-  }
-}