sMerge branch 'PMSManager_refactor'

2024-12-27 10:01:58 +09:00
parent 0e45074ea5 9bff204fb4
commit 56175078d6
19 changed files with 870 additions and 272 deletions
--- a/antifroud/migrations/0002_initial.py
+++ b/antifroud/migrations/0002_initial.py
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # Generated by Django 5.1.4 on 2024-12-19 12:42
+=======
+# Generated by Django 5.1.4 on 2024-12-25 04:55
+>>>>>>> PMSManager_refactor

 import django.db.models.deletion
 from django.db import migrations, models