resolve rebase errors

This commit is contained in:
chris meyers
2020-03-18 16:10:17 -04:00
committed by Ryan Petrello
parent 03b73027e8
commit f5193e5ea5
2 changed files with 1 additions and 2 deletions
@@ -11,7 +11,7 @@ from awx.main.utils.handlers import AWXProxyHandler
from awx.main.dispatch import get_local_queuename, reaper
from awx.main.dispatch.control import Control
from awx.main.dispatch.pool import AutoscalePool
from awx.main.dispatch.worker import AWXConsumer, TaskWorker
from awx.main.dispatch.worker import AWXConsumerPG, TaskWorker
from awx.main.dispatch import periodic
logger = logging.getLogger('awx.main.dispatch')