migration merger issues fix
This commit is contained in:
@@ -1,8 +1,4 @@
|
||||
<<<<<<< HEAD
|
||||
# Generated by Django 5.1.4 on 2024-12-25 07:00
|
||||
=======
|
||||
# Generated by Django 5.1.4 on 2024-12-28 00:49
|
||||
>>>>>>> zorn-dev
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
Reference in New Issue
Block a user