From 018350a1dae150337e7b66ac24fb1222dac5f14b Mon Sep 17 00:00:00 2001
From: Botond Baranyi <botond.baranyi@ericsson.com>
Date: Fri, 7 May 2021 17:02:22 +0200
Subject: [PATCH] Fixed failed merge
Signed-off-by: Botond Baranyi <botond.baranyi@ericsson.com>
---
regression_test/XML/Issue545/Issue545b.ttcn | 3 ---
1 file changed, 3 deletions(-)
diff --git a/regression_test/XML/Issue545/Issue545b.ttcn b/regression_test/XML/Issue545/Issue545b.ttcn
index 3b871e6be..1ec94de34 100644
--- a/regression_test/XML/Issue545/Issue545b.ttcn
+++ b/regression_test/XML/Issue545/Issue545b.ttcn
@@ -11,11 +11,8 @@
******************************************************************************/
module Issue545b {
-<<<<<<< HEAD
// global namespace variants should no longer overwrite inherited namespace variants (issue #545)
-=======
->>>>>>> 97652b443bcdc798cfe153813828986f87dc8f2d
import from Issue545a all;
type record T2 {
--
GitLab