Skip to content

Commit ab8f2d9

Browse files
author
qifeng
committedJan 20, 2022
fix:
1 parent 958a671 commit ab8f2d9

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed
 

‎django_celery_beat/schedulers.py

+1-10
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,7 @@
1515
from kombu.utils.json import dumps, loads
1616

1717
from django.conf import settings
18-
<<<<<<< HEAD
19-
from django.db import (
20-
DEFAULT_DB_ALIAS,
21-
close_old_connections,
22-
router,
23-
transaction
24-
)
25-
=======
2618
from django.db import transaction, close_old_connections, router, DEFAULT_DB_ALIAS
27-
>>>>>>> dbb0cde78b3b0bdcd444405cc4ac68ccf8835076
2819
from django.db.utils import DatabaseError, InterfaceError
2920
from django.core.exceptions import ObjectDoesNotExist
3021

@@ -304,7 +295,7 @@ def target_db(self):
304295
# If the project does not actually implement this method,
305296
# DEFAULT_DB_ALIAS will be automatically returned.
306297
# The exception will be located to the django routing section
307-
db = router.db_for_write(self.Model
298+
db = router.db_for_write(self.Model)
308299
return db
309300

310301
def _sync(self):

0 commit comments

Comments
 (0)
Please sign in to comment.