mirror of
https://github.com/luau-lang/luau.git
synced 2024-11-15 22:35:43 +08:00
resolve one last merge conflict
This commit is contained in:
parent
e70eec0c59
commit
79854143e4
@ -23,11 +23,7 @@ LUAU_FASTFLAG(DebugLuauDeferredConstraintResolution)
|
|||||||
struct LimitFixture : BuiltinsFixture
|
struct LimitFixture : BuiltinsFixture
|
||||||
{
|
{
|
||||||
#if defined(_NOOPT) || defined(_DEBUG)
|
#if defined(_NOOPT) || defined(_DEBUG)
|
||||||
<<<<<<< HEAD
|
|
||||||
ScopedFastInt LuauTypeInferRecursionLimit{"LuauTypeInferRecursionLimit", 90};
|
|
||||||
=======
|
|
||||||
ScopedFastInt LuauTypeInferRecursionLimit{FInt::LuauTypeInferRecursionLimit, 100};
|
ScopedFastInt LuauTypeInferRecursionLimit{FInt::LuauTypeInferRecursionLimit, 100};
|
||||||
>>>>>>> upstream
|
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user