mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-10-30 03:56:23 -05:00 
			
		
		
		
	Resolve migration conflicts
This commit is contained in:
		| @@ -1,4 +1,4 @@ | ||||
| # Generated by Django 4.1.4 on 2022-01-24 04:48 | ||||
| # Generated by Django 4.1.4 on 2022-02-03 04:24 | ||||
| 
 | ||||
| from django.conf import settings | ||||
| from django.db import migrations, models | ||||
| @@ -9,7 +9,7 @@ class Migration(migrations.Migration): | ||||
| 
 | ||||
|     dependencies = [ | ||||
|         migrations.swappable_dependency(settings.AUTH_USER_MODEL), | ||||
|         ("documents", "1029_alter_document_archive_serial_number"), | ||||
|         ("documents", "1030_alter_paperlesstask_task_file_name"), | ||||
|     ] | ||||
| 
 | ||||
|     operations = [ | ||||
		Reference in New Issue
	
	Block a user
	 shamoon
					shamoon