Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflicting migration files

Browse Source
This commit is contained in:
Oliver Walters 2021-01-05 00:58:48 +11:00
parent e715ea5d79
commit 855098e30b
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
InvenTree/part/migrations/0062_merge_20210105_0056.py Normal file
View File

@ -0,0 +1,14 @@
# Generated by Django 3.0.7 on 2021-01-04 13:56
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('part', '0061_auto_20210104_2331'),
('part', '0061_auto_20210103_2313'),
]
operations = [
]