merge antifraud

2024-12-23 10:27:44 +09:00
parent 61fffd3be4 31e4a50ad8
commit 3dd5f2238e
32 changed files with 136 additions and 555 deletions
--- a/app_settings/migrations/0001_initial.py
+++ b/app_settings/migrations/0001_initial.py
@@ -1,4 +1,8 @@
+<<<<<<< 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