Skip to content

Commit de26575

Browse files
committed
resolve CR
1 parent dd79388 commit de26575

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

osf/models/user.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
from django.contrib.auth.base_user import AbstractBaseUser, BaseUserManager
1919
from django.contrib.auth.hashers import check_password
2020
from django.contrib.auth.models import PermissionsMixin
21+
from django.contrib.contenttypes.models import ContentType
2122
from django.core.exceptions import FieldDoesNotExist
2223
from django.dispatch import receiver
2324
from django.db import models
@@ -877,7 +878,6 @@ def merge_user(self, user):
877878
except Exception as e:
878879
logger.exception(f'Failed to SHARE reindex preprint {preprint._id} during user merge: {e}')
879880

880-
from django.contrib.contenttypes.models import ContentType
881881
from osf.models import AbstractNode, Preprint
882882
from addons.osfstorage.models import OsfStorageFile
883883
node_ctype = ContentType.objects.get_for_model(AbstractNode)

0 commit comments

Comments
 (0)