From b644707f85fc42b8e76f4178c0ba80f8687b06cc Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Thu, 9 Apr 2026 12:14:59 +0530
Subject: [PATCH] Resolved conflict

---
 src/main/resources/application.properties                     | 2 +-
 src/main/resources/db/changelog/db.changelog-1.0.0.xml        | 3 +++
 .../db/dump/update_email_config_for_mailgun_09_04_2026.sql    | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/db/dump/update_email_config_for_mailgun_09_04_2026.sql

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 7fffc70b..f3798939 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -57,7 +57,7 @@ active.profile.folder=dev
 # MailGun API
 mailGun_base_url=https://api.eu.mailgun.net/
 #Below credentials are only for sending mail to rinaldo
-mailGun_apiKey= 398e3dea1911fe941af261906ec99362-07e2c238-8094421f
+mailGun_apiKey= 541d407d4a8e2cd943d00cb4529f0fba-415ae7fb-7aded414
 mailGun_user=comunicazione@paghiamoci.ai
 mailGun_domainName=paghiamoci.ai
 
diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
index 7f005f1f..9c50da89 100644
--- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml
+++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
@@ -3205,4 +3205,7 @@
         </addColumn>
     </changeSet>
 
+    <changeSet id="09-04-2026_RK_115923" author="Rajesh Khore">
+        <sqlFile dbms="postgresql" path="db/dump/update_email_config_for_mailgun_09_04_2026.sql" />
+    </changeSet>
 </databaseChangeLog>
diff --git a/src/main/resources/db/dump/update_email_config_for_mailgun_09_04_2026.sql b/src/main/resources/db/dump/update_email_config_for_mailgun_09_04_2026.sql
new file mode 100644
index 00000000..bebf92a1
--- /dev/null
+++ b/src/main/resources/db/dump/update_email_config_for_mailgun_09_04_2026.sql
@@ -0,0 +1,4 @@
+UPDATE hub
+SET
+    email_service_config = 'FgMmDkXJGSWaZIKaR/NyYcilihMOy7gDL/wbeTqYbJeNyUpj4J6ew2qAznFimoTePqoOriC9cyX9Jjlvr2QKsDCL6N2OmozX9uIhqmgvTRS2QLC6oVg4wvwvWJZig3i70YWQQrkXXZQ6f2pg9xzMxYJZ75KpnqFzqudjQ7BSnrzRyK1USODyN7rczkcDSVGn+3cbj0/mWMPWxF1St+DzFt27Sos0pTtoxvXqHorGe6PQauN540vXlUJNA4ouZAh+R3TL4G/vXu46LpqhvqTEDZ24XI8x6rhBHUMKKBLxMe3+ZfIbyCZ9COm5zvEaJ5cB'
+WHERE UNIQUE_UUID = 't7jh5wfg9QXylNaTZkPoE';
\ No newline at end of file