From b5fdd7fefd340f9bd8a4582ffac733c02faf2a4a Mon Sep 17 00:00:00 2001
From: Mono Mono <monomono@disroot.org>
Date: Sat, 28 Dec 2024 17:13:55 -0500
Subject: [PATCH]  #69 fix(migrations): conflict.

---
 .../migrations/0036_merge_20241228_2212.py         | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 tienda_ilusion/don_confiao/migrations/0036_merge_20241228_2212.py

diff --git a/tienda_ilusion/don_confiao/migrations/0036_merge_20241228_2212.py b/tienda_ilusion/don_confiao/migrations/0036_merge_20241228_2212.py
new file mode 100644
index 0000000..a1091c5
--- /dev/null
+++ b/tienda_ilusion/don_confiao/migrations/0036_merge_20241228_2212.py
@@ -0,0 +1,14 @@
+# Generated by Django 5.0.6 on 2024-12-28 22:12
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('don_confiao', '0034_alter_payment_type_payment_alter_sale_date_and_more'),
+        ('don_confiao', '0035_reconciliationjar_total_cash_purchases'),
+    ]
+
+    operations = [
+    ]