fix merge conflictsv0.7.5

1 files changed, 1 insertions, 6 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/common.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/common.scala
index 7318ff6..f77c2e0 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/common.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/common.scala
@@ -3,7 +3,7 @@ package xyz.driver.pdsuidomain.fakes.entities
 import java.time.{LocalDate, LocalDateTime, LocalTime}
 
 import xyz.driver.core.generators.{nextDouble, nextOption}
-import xyz.driver.pdsuicommon.domain.{FuzzyValue, LongId, StringId, UuidId}
+import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId}
 import xyz.driver.pdsuidomain.entities.{Trial, TrialHistory}
 
 import scala.util.Random
@@ -29,8 +29,6 @@ object common {
     1 + Random.nextInt(28) // all months have at least 28 days
   )
 
-  def nextCondition = generators.oneOf[Trial.Condition](Trial.Condition.All)
-
   def nextTrialAction = generators.oneOf[TrialHistory.Action](TrialHistory.Action.All)
 
   def nextTrialState = generators.oneOf[TrialHistory.State](TrialHistory.State.All)
@@ -52,9 +50,6 @@ object common {
     ranges.map(_._1) -> ranges.flatMap(_._2)
   }
 
-  def nextFuzzyValue(): FuzzyValue =
-    generators.oneOf[FuzzyValue](FuzzyValue.All)
-
   def nextStartAndEndPages: (Option[Double], Option[Double]) =
     genBoundedRangeOption[Double](nextDouble(), nextDouble())