From 5b2cf83eb692e4a78a0f0b3d550a99febae4de4f Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Thu, 20 Jun 2024 21:44:28 -0400 Subject: [PATCH] Resolve a conflict #11448 11518 --- .../rabbitmq_management/src/rabbit_mgmt_oauth_bootstrap.erl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_oauth_bootstrap.erl b/deps/rabbitmq_management/src/rabbit_mgmt_oauth_bootstrap.erl index 86c47f6b9453..f31704acdacc 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_oauth_bootstrap.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_oauth_bootstrap.erl @@ -9,12 +9,6 @@ -export([init/2]). -<<<<<<< HEAD --include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("amqp_client/include/amqp_client.hrl"). - -======= ->>>>>>> ccb0059cd4 (Dynamically load oauth-related libraries) %%-------------------------------------------------------------------- init(Req0, State) ->