Resolve a conflict #11415 #11525

Author: michaelklishin

deps/rabbit/priv/schema/rabbit.schema

@@ -2636,8 +2636,6 @@ end}.
 }.
 
 % ===============================
-<<<<<<< HEAD
-=======
 % AMQP 1.0
 % ===============================
 
@@ -2877,7 +2875,6 @@ fun(Conf) ->
 end}.
 
 % ===============================
->>>>>>> 145592efe9 (Remove server options and move to rabbit schema)
 % Validators
 % ===============================