From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 13 Feb 2026 17:47:15 +0000 (-0800) Subject: Fix migration conflict X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56d1b5677a2ebbe13bdfbb02fb0836e233ccb4dd;p=thirdparty%2Fpaperless-ngx.git Fix migration conflict --- diff --git a/src/paperless_mail/migrations/0002_mailrule_stop_processing.py b/src/paperless_mail/migrations/0003_mailrule_stop_processing.py similarity index 89% rename from src/paperless_mail/migrations/0002_mailrule_stop_processing.py rename to src/paperless_mail/migrations/0003_mailrule_stop_processing.py index 0f92e7d2f..d995dd643 100644 --- a/src/paperless_mail/migrations/0002_mailrule_stop_processing.py +++ b/src/paperless_mail/migrations/0003_mailrule_stop_processing.py @@ -6,7 +6,7 @@ from django.db import models class Migration(migrations.Migration): dependencies = [ - ("paperless_mail", "0001_initial"), + ("paperless_mail", "0002_optimize_integer_field_sizes"), ] operations = [