From 05235d234e7a6203d484a6504cbbe3660d6ec053 Mon Sep 17 00:00:00 2001
From: Boris <admin@k-boris.tech>
Date: Wed, 1 Apr 2026 23:38:22 +0300
Subject: [PATCH] Add merge migration for conflicting 0006 leaves

0006_item_category_unending was already applied to the dev DB before
the rename commit, causing a conflict with 0006_item_status_unending.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 backlogger/migrations/0007_merge.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 backlogger/migrations/0007_merge.py

diff --git a/backlogger/migrations/0007_merge.py b/backlogger/migrations/0007_merge.py
new file mode 100644
index 0000000..bd370ac
--- /dev/null
+++ b/backlogger/migrations/0007_merge.py
@@ -0,0 +1,12 @@
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('backlogger', '0006_item_category_unending'),
+        ('backlogger', '0006_item_status_unending'),
+    ]
+
+    operations = [
+    ]