Skip to content

Commit a5643a3

Browse files
ansdmergify[bot]
authored andcommitted
Remove unused function
(cherry picked from commit f293c11) # Conflicts: # deps/rabbit/test/queue_utils.erl
1 parent 1dfcbb1 commit a5643a3

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

deps/rabbit/test/queue_utils.erl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,15 @@ filter_queues(Expected, Got) ->
157157
lists:member(hd(G), Keys)
158158
end, Got).
159159

160+
<<<<<<< HEAD
160161
fifo_machines_use_same_version(Config) ->
161162
Nodenames = rabbit_ct_broker_helpers:get_node_configs(Config, nodename),
162163
fifo_machines_use_same_version(Config, Nodenames).
163164

164165
fifo_machines_use_same_version(Config, Nodenames)
166+
=======
167+
ra_machines_use_same_version(MachineModule, Config, Nodenames)
168+
>>>>>>> f293c11a0 (Remove unused function)
165169
when length(Nodenames) >= 1 ->
166170
[MachineAVersion | OtherMachinesVersions] =
167171
[(catch rabbit_ct_broker_helpers:rpc(

0 commit comments

Comments
 (0)