fix mere

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