From b2afedf9f83a8ed6832c80cb9474aa6eafe15ff0 Mon Sep 17 00:00:00 2001
From: Francis Reat <francis.reat@hardis-group.com>
Date: Wed, 17 Dec 2025 17:24:26 +0100
Subject: [PATCH] modif sur les rdz

---
 RPtoRFX_PrepOrder_DefaultHeaderData.ftl | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl
index c196fce..cf1ae16 100644
--- a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl
+++ b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl
@@ -2,7 +2,6 @@
 
 <#-- How to use MD Header map
     Example :
-<<<<<<< HEAD
     <#assign pick_sequence_code = Header_MetaData_Map["OrderType"].String!""/>
 
     If your MD is :
@@ -17,14 +16,6 @@
 
 <#assign activity_code = "ALI"/>
 <#assign originator_code = "001"/>
-=======
-    <#assign pick_sequence_code = Header_MetaData_Map["OrderType"]!""/>
--->
-
-
-<#assign activity_code = "ALI"/>
-<#assign originator_code = "DEPT ALIM"/>
->>>>>>> main
 <#assign preparation_type_code = "010"/>
 <#assign requested_delivery_date_type = "010"/>
 <#assign consolidated_delivery_flag ="false"/>
@@ -32,7 +23,6 @@
 <#assign protected_flag ="false"/>
 <#assign automatic_generation_flag ="false"/>
 <#assign apt_with_end_consignee_flag="false"/>
-<<<<<<< HEAD
 
 <#-- A supprimer si utilisation de la table de correspondance-->
 <#--To be deleted if using the correspondence table-->
@@ -55,6 +45,3 @@ Assigning to a load if you set up Load Grouping+Distribution Master Plan-->
 
 
 
-=======
-<#assign load_grouping = "STD"/>
->>>>>>> main