diff options
| author | Marvin Bertin <marvin.bertin@gmail.com> | 2017-10-10 11:54:20 -0700 |
|---|---|---|
| committer | Marvin Bertin <marvin.bertin@gmail.com> | 2017-10-10 11:54:20 -0700 |
| commit | 19a70318ecee81872fffe23c03d83e725610911d (patch) | |
| tree | 984510310c95856fcdcb463d9a242f9773795266 /src/main/scala/xyz/driver/pdsuidomain/entities/SlotArmEligibilityArm.scala | |
| parent | 05aa114cfd22228f0457b6457ce441af5eabfc60 (diff) | |
| parent | 4f83461cba1f78e607ca2a4edb6fa26f6e16e732 (diff) | |
| download | rest-query-19a70318ecee81872fffe23c03d83e725610911d.tar.gz rest-query-19a70318ecee81872fffe23c03d83e725610911d.tar.bz2 rest-query-19a70318ecee81872fffe23c03d83e725610911d.zip | |
fix merge conflicts with master
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/entities/SlotArmEligibilityArm.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/entities/SlotArmEligibilityArm.scala | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/SlotArmEligibilityArm.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/SlotArmEligibilityArm.scala index f9aed6c..70114de 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/SlotArmEligibilityArm.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/SlotArmEligibilityArm.scala @@ -3,9 +3,7 @@ package xyz.driver.pdsuidomain.entities import xyz.driver.pdsuicommon.domain.LongId import xyz.driver.pdsuicommon.logging._ -final case class SlotArmEligibilityArm(slotArmId: LongId[SlotArm], - eligibilityArmId: LongId[EligibilityArm]) - +final case class SlotArmEligibilityArm(slotArmId: LongId[SlotArm], eligibilityArmId: LongId[EligibilityArm]) object SlotArmEligibilityArm { implicit def toPhiString(x: SlotArmEligibilityArm): PhiString = { |