From 767c0887c2eb6c43a144f02613ae8eb25c4a7516 Mon Sep 17 00:00:00 2001
From: YannGarcia <garcia.yann@gmail.com>
Date: Mon, 15 May 2023 14:57:39 +0200
Subject: [PATCH] Add encode XML variant

---
 ttcn/LibHttp/ttcn/LibHttp_XmlMessageBodyTypes.ttcn | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ttcn/LibHttp/ttcn/LibHttp_XmlMessageBodyTypes.ttcn b/ttcn/LibHttp/ttcn/LibHttp_XmlMessageBodyTypes.ttcn
index 343caf1..96cfb2f 100644
--- a/ttcn/LibHttp/ttcn/LibHttp_XmlMessageBodyTypes.ttcn
+++ b/ttcn/LibHttp/ttcn/LibHttp_XmlMessageBodyTypes.ttcn
@@ -19,11 +19,6 @@ module LibHttp_XmlMessageBodyTypes {
     }
     
 } with {
-<<<<<<< Updated upstream
-  variant "";
-  encode "XML"
-=======
   encode "XML";
   variant ""
->>>>>>> Stashed changes
 } // End of LibHttp_XmlMessageBodyTypes
-- 
GitLab