Resolve a conflict #11448 11518

rabbitmq · Jun 21, 2024 · 5b2cf83 · 5b2cf83
1 parent 5836eeb
commit 5b2cf83
Showing 1 changed file with 0 additions and 6 deletions.
diff --git 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) ->