merge antifraud

app_settings/apps.py

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 from django.apps import AppConfig, apps
 
 class AppSettingsConfig(AppConfig):
@@ -12,3 +13,12 @@ class AppSettingsConfig(AppConfig):
             import app_settings.signals  # Регистрация сигналов
         except ImportError as e:
             print(f"Ошибка импорта signals: {e}")
+=======
+from django.apps import AppConfig
+
+
+class SettingsConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'app_settings'
+    verbose_name="Настройки системы"
+>>>>>>> antifraud