From 54f01260589dd978f3026796303ad79aac21605f Mon Sep 17 00:00:00 2001 From: Adarnof Date: Wed, 17 Feb 2016 22:44:06 +0000 Subject: [PATCH] Removed conflict --- celerytask/tasks.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/celerytask/tasks.py b/celerytask/tasks.py index 99c2a21a..dd6281ef 100755 --- a/celerytask/tasks.py +++ b/celerytask/tasks.py @@ -2,11 +2,8 @@ from django.conf import settings from celery.task import periodic_task from django.contrib.auth.models import User from django.contrib.auth.models import Group -<<<<<<< HEAD from notifications import notify -======= from celery import task ->>>>>>> 450f577860abad4644e02eb5a14a58bf047f17b2 from models import SyncGroupCache from celery.task.schedules import crontab from services.managers.openfire_manager import OpenfireManager