mergse

2024-12-28 09:44:58 +09:00
parent 5e3ed91b3a
commit 7350989113
11 changed files with 14160 additions and 324 deletions
--- a/antifroud/migrations/0002_initial.py
+++ b/antifroud/migrations/0002_initial.py
@@ -1,8 +1,4 @@
-<<<<<<< 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