From 81da7920547e0e28746e235149710abfcc56f936 Mon Sep 17 00:00:00 2001 From: meeb Date: Mon, 26 Feb 2024 17:33:46 +1100 Subject: [PATCH] fix migration conflict --- ...delete_files_on_disk.py => 0022_add_delete_files_on_disk.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename tubesync/sync/migrations/{0021_add_delete_files_on_disk.py => 0022_add_delete_files_on_disk.py} (89%) diff --git a/tubesync/sync/migrations/0021_add_delete_files_on_disk.py b/tubesync/sync/migrations/0022_add_delete_files_on_disk.py similarity index 89% rename from tubesync/sync/migrations/0021_add_delete_files_on_disk.py rename to tubesync/sync/migrations/0022_add_delete_files_on_disk.py index 5745d478..959f3d8b 100644 --- a/tubesync/sync/migrations/0021_add_delete_files_on_disk.py +++ b/tubesync/sync/migrations/0022_add_delete_files_on_disk.py @@ -5,7 +5,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('sync', '0020_auto_20231024_1825'), + ('sync', '0021_source_copy_channel_images'), ] operations = [