Sync ra version across bazel & make

HoloRin · HoloRin · commit c51c23057134 · 2022-03-15T09:20:09.000+01:00
(cherry picked from commit 7659235) # Conflicts: # rabbitmq-components.mk
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk
@@ -116,7 +116,7 @@ dep_cowlib = hex 2.9.1
 dep_jsx = hex 3.1.0
 dep_looking_glass = git https://github.com/rabbitmq/looking_glass master
 dep_prometheus = git https://github.com/deadtrickster/prometheus.erl 06425c21a39c1564164f1cc3fe5bdfa8b23b1f78
-dep_ra = hex 2.0.3
+dep_ra = hex 2.0.4
 dep_ranch = hex 2.1.0
 dep_recon = hex 2.5.2
 dep_redbug = hex 2.0.7
diff --git a/release-notes/3.10.0.md b/release-notes/3.10.0.md
diff --git a/workspace_helpers.bzl b/workspace_helpers.bzl
@@ -213,13 +213,8 @@ erlang_app(
 
     hex_pm_erlang_app(
         name = "ra",
-<<<<<<< HEAD
-        version = "2.0.3",
-        sha256 = "0b159c7da28fc581042f462f51b042b3fed244cdaa2b2061e6430ba6d12a3972",
-=======
         version = "2.0.4",
         sha256 = "8e3550be1df23b5b1ba9d02e0c8c79febb8eae8a6dcbbba746bd5180f39aee1c",
->>>>>>> 3e52cc8fb5 (Use ra (and its deps) from hex.pm)
         first_srcs = [
             "src/ra_machine.erl",
             "src/ra_snapshot.erl",
