From e1671892a00ed3449fe7fd63da3af3adef3fe2d6 Mon Sep 17 00:00:00 2001 From: Laurent Date: Wed, 9 Jul 2025 16:31:01 +0200 Subject: [PATCH] fix mere --- api/views.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/api/views.py b/api/views.py index 6727931..c69c63a 100644 --- a/api/views.py +++ b/api/views.py @@ -15,7 +15,6 @@ from django.shortcuts import get_object_or_404 from .serializers import ClubSerializer, CourtSerializer, DateIntervalSerializer, DrawLogSerializer, TournamentSerializer, UserSerializer, EventSerializer, RoundSerializer, GroupStageSerializer, MatchSerializer, TeamScoreSerializer, TeamRegistrationSerializer, PlayerRegistrationSerializer, PurchaseSerializer, ShortUserSerializer, FailedApiCallSerializer, LogSerializer, DeviceTokenSerializer, CustomUserSerializer, UnregisteredTeamSerializer, UnregisteredPlayerSerializer, ImageSerializer from tournaments.models import Club, Tournament, CustomUser, Event, Round, GroupStage, Match, TeamScore, TeamRegistration, PlayerRegistration, Court, DateInterval, Purchase, FailedApiCall, Log, DeviceToken, DrawLog, UnregisteredTeam, UnregisteredPlayer, Image -<<<<<<< HEAD from crm.serializers import CRMActivitySerializer, CRMProspectSerializer, CRMEntitySerializer from crm.models import Activity, Prospect, Entity @@ -28,8 +27,6 @@ from rest_framework.exceptions import MethodNotAllowed from django.http import Http404 from django.db.models import Q -======= ->>>>>>> f988fc1c06ccb26ea16383304e65161733a71fca from .permissions import IsClubOwner from .utils import check_version_smaller_than_1_1_12, scrape_fft_club_tournaments, scrape_fft_club_tournaments_all_pages, get_umpire_data, scrape_fft_all_tournaments