From 7675f64d1592868f4c3859758c75716dabb7c24a Mon Sep 17 00:00:00 2001 From: Abdurrahman Saber Date: Sun, 14 Sep 2025 16:26:21 +0300 Subject: [PATCH] [IMP] remove conflict --- odex-event/event_custom/data/email_template_data.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odex-event/event_custom/data/email_template_data.xml b/odex-event/event_custom/data/email_template_data.xml index 165bba382..b76dd97b4 100644 --- a/odex-event/event_custom/data/email_template_data.xml +++ b/odex-event/event_custom/data/email_template_data.xml @@ -1,6 +1,6 @@ - + Event: Change in Tracks