From 632cc2b6475aa0f8c619d622fa3a7df10b3816e7 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Thu, 17 Jul 2025 10:24:02 +0200
Subject: [PATCH] dispute

---
 RFXtoRP_HsaDispute_Created.ftl | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl
index 761d612..820fd8b 100644
--- a/RFXtoRP_HsaDispute_Created.ftl
+++ b/RFXtoRP_HsaDispute_Created.ftl
@@ -40,11 +40,7 @@
                 "Value": "${dispute.dispute_amount}"
              },
             <#-- Claim metadata inclusion  -->
-<<<<<<< HEAD
-            <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">
-=======
             <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">,
->>>>>>> 17184ed (SCPN1-9059)
             <#-- To configure -->
             <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">
             <#if dispute.dispute_type_code=="050" >