Resolve emqx/emqtt dependency bump conflicts

Author: ansd

MODULE.bazel

@@ -184,11 +184,7 @@ erlang_package.git_package(
     name = "emqtt",
     build_file = "@rabbitmq-server//bazel:BUILD.emqtt",
     repository = "emqx/emqtt",
-<<<<<<< HEAD
-    tag = "1.7.0-rc.2",
-=======
     tag = "1.8.2",
->>>>>>> bfa4e9f2c7 (Bump emqx/emqtt to 1.8.2)
 )
 
 erlang_package.hex_package(

deps/rabbitmq_auth_backend_oauth2/Makefile

@@ -11,10 +11,5 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
 dep_jose = git https://github.com/potatosalad/erlang-jose 2b1d66b
 dep_base64url = hex 1.0.1
 
-<<<<<<< HEAD
-=======
-dep_emqtt = git https://github.com/emqx/emqtt.git 1.8.2
-
->>>>>>> bfa4e9f2c7 (Bump emqx/emqtt to 1.8.2)
 include ../../rabbitmq-components.mk
 include ../../erlang.mk

deps/rabbitmq_mqtt/Makefile

@@ -39,11 +39,7 @@ DEPS = ranch rabbit_common rabbit amqp_client ra
 TEST_DEPS = emqtt ct_helper rabbitmq_ct_helpers rabbitmq_ct_client_helpers
 
 dep_ct_helper = git https://github.com/extend/ct_helper.git master
-<<<<<<< HEAD
-dep_emqtt = git https://github.com/emqx/emqtt.git 1.7.0-rc.2
-=======
 dep_emqtt = git https://github.com/emqx/emqtt.git 1.8.2
->>>>>>> bfa4e9f2c7 (Bump emqx/emqtt to 1.8.2)
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk

deps/rabbitmq_web_mqtt/Makefile

@@ -20,11 +20,6 @@ TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers
 # See rabbitmq-components.mk.
 BUILD_DEPS += ranch
 
-<<<<<<< HEAD
-=======
-dep_emqtt = git https://github.com/emqx/emqtt.git 1.8.2
-
->>>>>>> 1c4f30742e (Bump emqx/emqtt to 1.8.2)
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk