From a99a6431b2a258254a76883c07ad9cacbad59285 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Thu, 12 Jun 2025 10:45:57 -0500
Subject: [PATCH] More merge fixes.

---
 core/api_views.py                                   | 13 +++----------
 ...{0013_proxysettings.py => 0014_proxysettings.py} |  4 ++--
 2 files changed, 5 insertions(+), 12 deletions(-)
 rename core/migrations/{0013_proxysettings.py => 0014_proxysettings.py} (92%)

diff --git a/core/api_views.py b/core/api_views.py
index db9725ee..01bd3f5a 100644
--- a/core/api_views.py
+++ b/core/api_views.py
@@ -4,13 +4,11 @@ import json
 import ipaddress
 import logging
 from rest_framework import viewsets, status
-from rest_framework.decorators import action
 from rest_framework.response import Response
 from django.shortcuts import get_object_or_404
-<<<<<<< HEAD
 from rest_framework.permissions import IsAuthenticated
-from rest_framework.decorators import api_view, permission_classes
-=======
+from rest_framework.decorators import api_view, permission_classes, action
+from drf_yasg.utils import swagger_auto_schema
 from .models import (
     UserAgent,
     StreamProfile,
@@ -25,9 +23,7 @@ from .serializers import (
     CoreSettingsSerializer,
     ProxySettingsSerializer,
 )
-from rest_framework.decorators import api_view, permission_classes, action
->>>>>>> 59e4a28b311d00d073f238e01e735d68a821c3f3
-from drf_yasg.utils import swagger_auto_schema
+
 import socket
 import requests
 import os
@@ -116,7 +112,6 @@ class CoreSettingsViewSet(viewsets.ModelViewSet):
 
         return Response({}, status=status.HTTP_200_OK)
 
-<<<<<<< HEAD
 class ProxySettingsViewSet(viewsets.ModelViewSet):
     """
     API endpoint for proxy settings.
@@ -173,10 +168,8 @@ class ProxySettingsViewSet(viewsets.ModelViewSet):
             serializer.is_valid(raise_exception=True)
             serializer.save()
             return Response(serializer.data)
-=======
 
 
->>>>>>> 59e4a28b311d00d073f238e01e735d68a821c3f3
 
 @swagger_auto_schema(
     method="get",
diff --git a/core/migrations/0013_proxysettings.py b/core/migrations/0014_proxysettings.py
similarity index 92%
rename from core/migrations/0013_proxysettings.py
rename to core/migrations/0014_proxysettings.py
index 1a69c4ef..1f50adea 100644
--- a/core/migrations/0013_proxysettings.py
+++ b/core/migrations/0014_proxysettings.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.1.6 on 2025-06-11 02:22
+# Generated by Django 5.1.6 on 2025-06-12 15:44
 
 from django.db import migrations, models
 
@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('core', '0012_default_active_m3u_accounts'),
+        ('core', '0013_default_network_access_settings'),
     ]
 
     operations = [