Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-16 07:50:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed conflict

Browse Source
This commit is contained in:
Adarnof 2016-02-17 22:44:06 +00:00
parent 58584903bc
commit 54f0126058
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
celerytask/tasks.py
View File

@ -2,11 +2,8 @@ from django.conf import settings
from celery.task import periodic_task from celery.task import periodic_task
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.auth.models import Group from django.contrib.auth.models import Group
<<<<<<< HEAD
from notifications import notify from notifications import notify
=======
from celery import task from celery import task
>>>>>>> 450f577860abad4644e02eb5a14a58bf047f17b2
from models import SyncGroupCache from models import SyncGroupCache
from celery.task.schedules import crontab from celery.task.schedules import crontab
from services.managers.openfire_manager import OpenfireManager from services.managers.openfire_manager import OpenfireManager