Merge branch 'master' of gitlab.eclipse.org:bbaranyi/titan.core

d2c56508 · Botond Baranyi · f8fe5fdc · 97652b44 · d2c56508
Commit d2c56508 authored 3 years ago by Botond Baranyi
--- a/regression_test/XML/Issue545/Issue545b.ttcn
+++ b/regression_test/XML/Issue545/Issue545b.ttcn
@@ -11,8 +11,11 @@
 ******************************************************************************/
 module Issue545b {

+<<<<<<< HEAD
 // global namespace variants should no longer overwrite inherited namespace variants (issue #545)

+=======
+>>>>>>> 97652b443bcdc798cfe153813828986f87dc8f2d
 import from Issue545a all;

 type record T2 {