Fixed broken merge

celery/loaders/default.py

@@ -23,11 +23,7 @@ DEFAULT_UNCONFIGURED_SETTINGS = {
 
 
 def wanted_module_item(item):
-<<<<<<< HEAD
     return item[0].isupper() and not item.startswith("_")
-=======
-    return not item.startswith("_")
->>>>>>> 6a78496... 90% coverage
 
 
 class Loader(BaseLoader):

celery/worker/listener.py

@@ -91,8 +91,6 @@ from celery.worker.job import TaskRequest, InvalidTaskError
 from celery.worker.control import ControlDispatch
 from celery.worker.heartbeat import Heart
 from celery.events import EventDispatcher
-from celery.messaging import establish_connection
-from celery.messaging import get_consumer_set, BroadcastConsumer
 from celery.exceptions import NotRegistered
 from celery.datastructures import SharedCounter