resolve conflicts

Author: HoloRin

deps/rabbitmq_auth_backend_oauth2/Makefile

@@ -1,14 +1,7 @@
 PROJECT = rabbitmq_auth_backend_oauth2
 PROJECT_DESCRIPTION = OAuth 2 and JWT-based AuthN and AuthZ backend
 
-<<<<<<< HEAD
-=======
-# We do not need QUIC as dependency of emqtt.
-BUILD_WITHOUT_QUIC=1
-export BUILD_WITHOUT_QUIC
-
 LOCAL_DEPS = inets public_key
->>>>>>> 8d107818bf (Add a workflow to compare the bazel/erlang.mk output)
 BUILD_DEPS = rabbit_common
 DEPS = rabbit cowlib jose base64url
 TEST_DEPS = cowboy rabbitmq_web_dispatch rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client