new make migrations after conflict migrations

hackerspace-ntnu · Apr 10, 2024 · 5dbadcc · 5dbadcc
1 parent b350367
commit 5dbadcc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...migrations/0030_alter_item_description.py → ...migrations/0031_alter_item_description.py b/...migrations/0030_alter_item_description.py → ...migrations/0031_alter_item_description.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.0.3 on 2024-03-16 17:47
+# Generated by Django 5.0.3 on 2024-04-10 20:32
 
 import markdownx.models
 from django.db import migrations
@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('inventory', '0029_equipment'),
+        ('inventory', '0030_alter_itemloan_loan_from'),
     ]
 
     operations = [