sadasd

app_settings/app_settings.py

@@ -1,18 +1,8 @@
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 from .models import LocalDatabase
 from decouple import config
 from django.conf import settings
 from .models import LocalDatabase
-
-def load_database_settings():
-    # Загружаем настройки из базы данных
-=======
-from decouple import config
-from django.conf import settings
-=======
->>>>>>> pms_plugins
 from django.apps import apps
 
 def load_database_settings(databases):
@@ -21,8 +11,7 @@ def load_database_settings(databases):
     :param databases: Существующий словарь DATABASES
     """
     LocalDatabase = apps.get_model('app_settings', 'LocalDatabase')
-<<<<<<< HEAD
->>>>>>> antifraud
+
     local_db_settings = LocalDatabase.objects.all()
     
     for db in local_db_settings:
@@ -35,9 +24,6 @@ def load_database_settings(databases):
             'HOST': db.host,
             'PORT': db.port,
         }
-=======
->>>>>>> pms_plugins
-
     try:
         local_db_settings = LocalDatabase.objects.filter(is_active=True)
         for db in local_db_settings: