Commit 018350a1 authored by Botond Baranyi's avatar Botond Baranyi
Browse files

Fixed failed merge

Signed-off-by: Botond Baranyi's avatarBotond Baranyi <>
parent d2c56508
......@@ -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 {
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