From 24a725db99786eaf5f37903429bfefcf8db12aaf Mon Sep 17 00:00:00 2001 From: liu fengyun Date: Mon, 24 Oct 2016 13:40:01 +0200 Subject: fix error in rebase merge --- src/dotty/tools/dotc/parsing/Parsers.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/dotty/tools/dotc/parsing/Parsers.scala b/src/dotty/tools/dotc/parsing/Parsers.scala index 412173f84..013541c71 100644 --- a/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/src/dotty/tools/dotc/parsing/Parsers.scala @@ -1492,7 +1492,7 @@ object Parsers { val tok = in.token val mod = atPos(in.skipToken()) { modOfToken(tok) } - if (mods is mod.flags) syntaxError(RepeatedModifier(flag.toString)) + if (mods is mod.flags) syntaxError(RepeatedModifier(mod.flags.toString)) addMod(mods, mod) } -- cgit v1.2.3