fix merge conflicts with master

1 files changed, 4 insertions, 4 deletions

diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/TrialFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/TrialFormatSuite.scala
index 3533c07..c9dc85f 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/TrialFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/TrialFormatSuite.scala
@@ -2,8 +2,8 @@ package xyz.driver.pdsuidomain.formats.json.sprayformats
 
 import java.time.LocalDateTime
 
-import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
+import spray.json._
 import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId}
 import xyz.driver.pdsuidomain.entities.Trial
 
@@ -33,16 +33,16 @@ class TrialFormatSuite extends FlatSpec with Matchers {
     )
     val writtenJson = trialWriter.write(orig)
 
-    writtenJson should be (
+    writtenJson should be(
       """{"isPartner":false,"assignee":null,"lastUpdate":"2017-08-10T18:16:19Z","previousStatus":null,
         "isUpdated":false,"overviewTemplate":"","phase":"","originalStudyDesignId":null,
         "hypothesisId":"3b80b2e2-5372-4cf5-a342-6e4ebe10fafd","originalTitle":"orig trial title",
         "studyDesignId":321,"lastActiveUser":null,"externalid":"40892a07-c638-49d2-9795-1edfefbbcc7c",
         "id":"NCT000001","status":"New","overview":null,"previousAssignee":null,"title":"trial title"}""".parseJson)
 
-    val updateTrialJson = """{"hypothesisId":null,"overview":"new overview"}""".parseJson
+    val updateTrialJson      = """{"hypothesisId":null,"overview":"new overview"}""".parseJson
     val expectedUpdatedTrial = orig.copy(hypothesisId = None, overview = Some("new overview"))
-    val parsedUpdateTrial = applyUpdateToTrial(updateTrialJson, orig)
+    val parsedUpdateTrial    = applyUpdateToTrial(updateTrialJson, orig)
     parsedUpdateTrial should be(expectedUpdatedTrial)
   }