Merge remote-tracking branch 'origin/master' into HEAD

This commit is contained in:
Rachael Alexanderson 2019-02-06 08:05:38 -05:00
commit 20a9587bb7
2 changed files with 2 additions and 2 deletions

View file

@ -2106,7 +2106,7 @@ public:
: FxExpression(EFX_Nop, p)
{
isresolved = true;
ValueType = TypeError;
ValueType = TypeVoid;
}
ExpEmit Emit(VMFunctionBuilder *build)
{