From 9e15bd62e838dc6c362e8e72a3ea4123effb246b Mon Sep 17 00:00:00 2001 From: Hao Liu Date: Mon, 6 Mar 2023 10:46:55 -0500 Subject: [PATCH] fix merge conflict --- awx/main/routing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/main/routing.py b/awx/main/routing.py index 44230a61dd..9625b23176 100644 --- a/awx/main/routing.py +++ b/awx/main/routing.py @@ -28,7 +28,7 @@ class AWXProtocolTypeRouter(ProtocolTypeRouter): websocket_urlpatterns = [ re_path(r'websocket/$', consumers.EventConsumer.as_asgi()), - re_path(r'websocket/relay/$', consumers.BroadcastConsumer.as_asgi()), + re_path(r'websocket/relay/$', consumers.RelayConsumer.as_asgi()), ] application = AWXProtocolTypeRouter(