Resolve a conflict #14814 #15014

Author: michaelklishin

deps/rabbit/priv/schema/rabbit.schema

@@ -2799,10 +2799,6 @@ fun(Conf) ->
     end
 end}.
 
-<<<<<<< HEAD
-%% See github.com/rabbitmq/osiris#192 and https://github.com/rabbitmq/rabbitmq-server/commit/9f162dfd01c1516d168e7d1fad39d33a929756e5
-%% Enables read-head
-=======
 {mapping, "stream.data_dir", "osiris.data_dir", [
   {datatype, string}
 ]}.
@@ -2816,7 +2812,6 @@ end}.
     end
 }.
 
->>>>>>> c81fbc5dc (Allow configuring osiris data_dir in Cuttlefish config)
 {mapping, "stream.read_ahead", "rabbit.stream_read_ahead",
     [{datatype, [{enum, [true, false]}, integer, string]}]}.
 

deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets

@@ -1278,7 +1278,7 @@ credential_validator.regexp = ^abc\\d+",
       {stream_read_ahead, false}
      ]}],
    []},
-<<<<<<< HEAD
+
   {stream_read_ahead_limit_bytes,
    "
     stream.read_ahead = 8192
@@ -1293,16 +1293,17 @@ credential_validator.regexp = ^abc\\d+",
    ",
    [{rabbit, [
       {stream_read_ahead, "8KiB"}
-=======
+     ]}],
+   []},
 
   %%
   %% Stream data dir
   %%
+
   {stream_data_dir,
    "stream.data_dir = /data/rabbitmq/stream",
    [{osiris, [
       {data_dir, "/data/rabbitmq/stream"}
->>>>>>> c81fbc5dc (Allow configuring osiris data_dir in Cuttlefish config)
      ]}],
    []}
 ].