Commit d2c56508 authored by Botond Baranyi's avatar Botond Baranyi

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

parents f8fe5fdc 97652b44
......@@ -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 {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment