Resolve a conflict #10032 #10038

michaelklishin · michaelklishin · commit ad582b246a8e · 2023-12-04T10:09:05.000-05:00
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -43,15 +43,7 @@ bazel_dep(
 
 bazel_dep(
     name = "rabbitmq_osiris",
-<<<<<<< HEAD
-<<<<<<< HEAD
-   version = "1.6.9",
-=======
-    version = "1.7.0",
->>>>>>> cb27208c06 (Osiris 1.7.0)
-=======
     version = "1.7.1",
->>>>>>> 81a57feb6b (Osiris 1.7.1)
     repo_name = "osiris",
 )
 
