Resolve conflicts

Author: michaelklishin

deps/rabbit/BUILD.bazel

@@ -521,12 +521,6 @@ rabbitmq_suite(
     additional_srcs = [
         "test/mirrored_supervisor_SUITE_gs.erl",
     ],
-<<<<<<< HEAD
-    deps = [
-        "//deps/rabbit_common:erlang_app",
-    ],
-=======
->>>>>>> 3a3ff308aa (Fix all dependencies for the dialyzer)
 )
 
 rabbitmq_suite(

deps/rabbit/src/rabbit_access_control.erl

@@ -16,15 +16,6 @@
 
 %%----------------------------------------------------------------------------
 
-<<<<<<< HEAD
--export_type([permission_atom/0]).
-
--type permission_atom() :: 'configure' | 'read' | 'write'.
-
-%%----------------------------------------------------------------------------
-
-=======
->>>>>>> 3a3ff308aa (Fix all dependencies for the dialyzer)
 -spec check_user_pass_login
         (rabbit_types:username(), rabbit_types:password()) ->
             {'ok', rabbit_types:user()} |

deps/rabbit/src/rabbit_exchange.erl

@@ -22,14 +22,8 @@
 %%----------------------------------------------------------------------------
 
 -export_type([name/0, type/0]).
-<<<<<<< HEAD
-
--type name() :: rabbit_types:r('exchange').
--type type() :: atom().
-=======
 -type name() :: rabbit_types:exchange_name().
 -type type() :: rabbit_types:exchange_type().
->>>>>>> 3a3ff308aa (Fix all dependencies for the dialyzer)
 -type fun_name() :: atom().
 
 %%----------------------------------------------------------------------------

deps/rabbit_common/src/rabbit_misc.erl

@@ -1450,25 +1450,6 @@ is_regular_file(Name) ->
         _ -> false
     end.
 
-<<<<<<< HEAD
-=======
-%% not exported by supervisor
--type supervisor_child_id() :: term().
--type supervisor_sup_ref() :: (Name :: atom())
-                            | {Name :: atom(), Node :: node()}
-                            | {'global', Name :: atom()}
-                            | {'via', Module :: module(), Name :: any()}
-                            | pid().
-
-%% this used to be in supervisor2
--spec find_child(Supervisor, Name) -> [pid()] when
-      Supervisor :: supervisor_sup_ref(),
-      Name :: supervisor_child_id().
-find_child(Supervisor, Name) ->
-    [Pid || {Name1, Pid, _Type, _Modules} <- supervisor:which_children(Supervisor),
-            Name1 =:= Name].
-
->>>>>>> 3a3ff308aa (Fix all dependencies for the dialyzer)
 %% -------------------------------------------------------------------------
 %% Begin copypasta from gen_server2.erl
 

deps/rabbitmq_consistent_hash_exchange/BUILD.bazel

@@ -43,12 +43,8 @@ plt(
     name = "base_plt",
     apps = ["mnesia"],
     libs = ["//deps/rabbitmq_cli:elixir"],
-<<<<<<< HEAD
-    deps = ["//deps/rabbitmq_cli:elixir"] + BUILD_DEPS + DEPS + RUNTIME_DEPS,
-=======
     plt = "//:base_plt",
     deps = ["//deps/rabbitmq_cli:elixir"] + BUILD_DEPS + DEPS,
->>>>>>> 3a3ff308aa (Fix all dependencies for the dialyzer)
 )
 
 dialyze(

deps/rabbitmq_mqtt/BUILD.bazel

@@ -52,13 +52,7 @@ DEPS = [
     "@ranch//:erlang_app",
 ]
 
-<<<<<<< HEAD
-RUNTIME_DEPS = [
-    "//deps/rabbit:erlang_app",
-]
-=======
 EXTRA_APPS = [ "ssl" ]
->>>>>>> 3a3ff308aa (Fix all dependencies for the dialyzer)
 
 rabbitmq_app(
     app_description = APP_DESCRIPTION,
@@ -67,7 +61,6 @@ rabbitmq_app(
     app_module = APP_MODULE,
     app_name = APP_NAME,
     build_deps = BUILD_DEPS,
-    runtime_deps = RUNTIME_DEPS,
     deps = DEPS,
     extra_apps = EXTRA_APPS,
 )
@@ -81,7 +74,7 @@ plt(
     plt = "//:base_plt",
     apps = EXTRA_APPS,
     libs = ["//deps/rabbitmq_cli:elixir"],
-    deps = ["//deps/rabbitmq_cli:elixir"] + BUILD_DEPS + DEPS + RUNTIME_DEPS,
+    deps = ["//deps/rabbitmq_cli:elixir"] + BUILD_DEPS + DEPS,
 )
 
 dialyze(