#69 fix(migrations): conflict.

2024-12-28 17:13:55 -05:00 · 2024-12-28 17:13:55 -05:00 · b5fdd7fefd
commit b5fdd7fefd
parent eaf1afdcb4
1 changed files with 14 additions and 0 deletions
--- a/tienda_ilusion/don_confiao/migrations/0036_merge_20241228_2212.py
+++ 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 = [
+    ]