From 905d19d187bcd272619df4db3375d0ca51c7e084 Mon Sep 17 00:00:00 2001
From: Domenico DiNicola <dom.dinicola@gmail.com>
Date: Tue, 11 Jun 2024 08:59:06 -0600
Subject: [PATCH] fix conflicts

---
 .../{0019_exporttemplate.py => 0020_exporttemplate.py}        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename src/hope_payment_gateway/apps/gateway/migrations/{0019_exporttemplate.py => 0020_exporttemplate.py} (93%)

diff --git a/src/hope_payment_gateway/apps/gateway/migrations/0019_exporttemplate.py b/src/hope_payment_gateway/apps/gateway/migrations/0020_exporttemplate.py
similarity index 93%
rename from src/hope_payment_gateway/apps/gateway/migrations/0019_exporttemplate.py
rename to src/hope_payment_gateway/apps/gateway/migrations/0020_exporttemplate.py
index 448a38e..d8a9bdb 100644
--- a/src/hope_payment_gateway/apps/gateway/migrations/0019_exporttemplate.py
+++ b/src/hope_payment_gateway/apps/gateway/migrations/0020_exporttemplate.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.0.4 on 2024-06-10 05:47
+# Generated by Django 5.0.4 on 2024-06-11 14:58
 
 import django.db.models.deletion
 import strategy_field.fields
@@ -8,7 +8,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("gateway", "0018_alter_financialserviceproviderconfig_delivery_mechanism"),
+        ("gateway", "0019_alter_financialserviceproviderconfig_key"),
     ]
 
     operations = [