Resolve a conflict (#9156)

Author: michaelklishin

deps/rabbitmq_management/src/rabbit_mgmt_features.erl

@@ -7,13 +7,8 @@
 
 -module(rabbit_mgmt_features).
 
-<<<<<<< HEAD
--export([is_op_policy_updating_disabled/0]).
-=======
 -export([is_op_policy_updating_disabled/0,
-         is_qq_replica_operations_disabled/0,
-         are_stats_enabled/0]).
->>>>>>> 2d74d24b80 (Disable add/delete/shrink/grow QQ operations via HTTP api)
+         is_qq_replica_operations_disabled/0]).
 
 is_qq_replica_operations_disabled() ->
     get_restriction([quorum_queue_replica_operations, disabled]).