luau-lang/luau
1
0
Fork 0
mirror of https://github.com/luau-lang/luau.git synced 2025-04-20 19:53:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

resolve one last merge conflict

Browse source
This commit is contained in:
Vighnesh 2023-12-01 19:11:31 -08:00
parent e70eec0c59
commit 79854143e4
1 changed files with 0 additions and 4 deletions

4
tests/RuntimeLimits.test.cpp
View file

@ -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
}; };