From e4b2c79f31deb3318543bd50af8faee6ddfffe78 Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Thu, 19 Sep 2024 17:45:24 -0400
Subject: [PATCH] misc: add resolve-conflict-dependencies for event streaming
 (#1412)

---
 .brazil.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.brazil.json b/.brazil.json
index a99e9327053..16c8ee6367e 100644
--- a/.brazil.json
+++ b/.brazil.json
@@ -19,7 +19,8 @@
     ],
     "resolvesConflictDependencies": {
       "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*" : ["KotlinxCoroutinesCoreJvm-1.x"],
-      "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.*": ["KotlinxCoroutinesJdk8-1.x"]
+      "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.*": ["KotlinxCoroutinesJdk8-1.x"],
+      "aws.smithy.kotlin:aws-event-stream:1.*": ["KotlinxCoroutinesCoreJvm-1.x"]
     }
   }
 }