Fixes broken merge

celery/__init__.py

@@ -5,11 +5,7 @@
 
 from __future__ import absolute_import
 
-<<<<<<< HEAD
 VERSION = (2, 6, 0, "a1")
-=======
-VERSION = (2, 5, 2)
->>>>>>> 2.5
 __version__ = ".".join(map(str, VERSION[0:3])) + "".join(VERSION[3:])
 __author__ = "Ask Solem"
 __contact__ = "ask@celeryproject.org"

celery/task/chords.py

@@ -13,6 +13,7 @@ from __future__ import absolute_import
 
 from celery import current_app
 from celery.local import Proxy
+from celery.task.sets import subtask
 from celery.utils import uuid
 
 Chord = Proxy(lambda: current_app.tasks["celery.chord"])