mirror of
https://github.com/inventree/InvenTree
synced 2024-08-30 18:33:04 +00:00
Merge conflicting migrations
This commit is contained in:
parent
80b615bfb7
commit
732034d9e5
@ -0,0 +1,14 @@
|
||||
# Generated by Django 3.2.5 on 2021-12-02 13:31
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('order', '0054_auto_20211201_2139'),
|
||||
('order', '0060_auto_20211129_1339'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
]
|
Loading…
Reference in New Issue
Block a user