Fixed conflict utils file and folder
This commit is contained in:
@ -9,8 +9,8 @@ from datetime import timedelta
|
||||
import csv
|
||||
|
||||
from ..models import CustomUser, Team, Member, NewCategory, Entry, NewEvent2
|
||||
from ..utils.date_converter import DateConverter
|
||||
from ..utils.name_splitter import NameSplitter
|
||||
from ..utils_code.date_converter import DateConverter
|
||||
from ..utils_code.name_splitter import NameSplitter
|
||||
|
||||
class EntryCSVProcessor:
|
||||
def __init__(self):
|
||||
|
||||
@ -17,7 +17,7 @@ import requests
|
||||
from rest_framework import serializers
|
||||
from django.db import IntegrityError
|
||||
from django.urls import reverse
|
||||
from .utils import S3Bucket, send_verification_email,send_invitation_email,send_team_join_email,send_reset_password_email
|
||||
from .utils_code import S3Bucket, send_verification_email,send_invitation_email,send_team_join_email,send_reset_password_email
|
||||
from django.conf import settings
|
||||
import uuid
|
||||
from rest_framework.exceptions import ValidationError as DRFValidationError
|
||||
|
||||
Reference in New Issue
Block a user