Fixed failed merge

Signed-off-by: Botond Baranyi <botond.baranyi@ericsson.com>

Fixed failed merge
Signed-off-by: Botond Baranyi <botond.baranyi@ericsson.com>
018350a1 · Botond Baranyi · d2c56508 · 018350a1
Commit 018350a1 authored 3 years ago by Botond Baranyi
--- 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 {