fix spec

AnyMindGroup · Sep 3, 2024 · f2a0002 · f2a0002
1 parent 81fa197
commit f2a0002
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/...-pubsub-google-test/src/test/scala/com/anymindgroup/pubsub/google/AvroPublisherSpec.scala b/...-pubsub-google-test/src/test/scala/com/anymindgroup/pubsub/google/AvroPublisherSpec.scala
@@ -91,13 +91,9 @@ object AvroPublisherSpec extends ZIOSpecDefault {
             )
         publishedOrderingKeys = testMessages.map(_.orderingKey)
         consumedOrderingKeys  = consumed.map(_.meta.orderingKey)
-<<<<<<< HEAD:zio-gc-pubsub-google-test/src/test/scala/com/anymindgroup/pubsub/google/AvroPublisherSpec.scala
         _                    <- assert(publishedOrderingKeys)(hasSameElements(consumedOrderingKeys))
-      } yield assert(consumedAttr)(hasSameElements(publishedAttrs))
-=======
         _                    <- assert(consumedAttr)(hasSameElements(publishedAttrs))
       } yield assert(publishedOrderingKeys)(hasSameElements(consumedOrderingKeys))
->>>>>>> master:zio-pubsub-google-test/zio-gc-pubsub-google-test/src/test/scala/com/anymindgroup/pubsub/google/AvroPublisherSpec.scala
     }) ::
       List(
         Encoding.Json,