mirror of
				https://github.com/inventree/InvenTree.git
				synced 2025-10-31 13:15:43 +00:00 
			
		
		
		
	Merge conflicting migration files
This commit is contained in:
		
							
								
								
									
										14
									
								
								InvenTree/part/migrations/0053_merge_20201103_1028.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								InvenTree/part/migrations/0053_merge_20201103_1028.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,14 @@ | |||||||
|  | # Generated by Django 3.0.7 on 2020-11-03 10:28 | ||||||
|  |  | ||||||
|  | from django.db import migrations | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class Migration(migrations.Migration): | ||||||
|  |  | ||||||
|  |     dependencies = [ | ||||||
|  |         ('part', '0052_auto_20201027_1557'), | ||||||
|  |         ('part', '0052_partrelated'), | ||||||
|  |     ] | ||||||
|  |  | ||||||
|  |     operations = [ | ||||||
|  |     ] | ||||||
		Reference in New Issue
	
	Block a user