mergse

2024-12-28 09:44:58 +09:00
parent 5e3ed91b3a
commit 7350989113
11 changed files with 14160 additions and 324 deletions
--- a/app_settings/migrations/0001_initial.py
+++ b/app_settings/migrations/0001_initial.py
@@ -85,11 +85,7 @@ class Migration(migrations.Migration):
        ),
    ]

-<<<<<<< HEAD
-# Generated by Django 5.1.4 on 2024-12-20 11:29
-=======
 # Generated by Django 5.1.4 on 2024-12-23 00:57
->>>>>>> antifraud

 from django.db import migrations, models