Replace json4s with circe (closes #71)

snowplow · Aug 7, 2018 · 8b06ee3 · 8b06ee3
1 parent fe486bf
commit 8b06ee3
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/test/scala/com.snowplowanalytics.snowplow.scalatracker/StressTest.scala b/src/test/scala/com.snowplowanalytics.snowplow.scalatracker/StressTest.scala
@@ -14,7 +14,11 @@ package com.snowplowanalytics.snowplow.scalatracker
 
 import java.io.FileWriter
 
+<<<<<<< HEAD
 import cats.implicits._
+=======
+import cats.syntax.either._
+>>>>>>> Replace json4s with circe (closes #71)
 
 import io.circe.Json
 import io.circe.parser.parse