From 79854143e46a5210b8fa920685f1a407eca67803 Mon Sep 17 00:00:00 2001
From: Vighnesh <vvijay@roblox.com>
Date: Fri, 1 Dec 2023 19:11:31 -0800
Subject: [PATCH] resolve one last merge conflict

---
 tests/RuntimeLimits.test.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/RuntimeLimits.test.cpp b/tests/RuntimeLimits.test.cpp
index 3959b774..75c9eda0 100644
--- a/tests/RuntimeLimits.test.cpp
+++ b/tests/RuntimeLimits.test.cpp
@@ -23,11 +23,7 @@ LUAU_FASTFLAG(DebugLuauDeferredConstraintResolution)
 struct LimitFixture : BuiltinsFixture
 {
 #if defined(_NOOPT) || defined(_DEBUG)
-<<<<<<< HEAD
-    ScopedFastInt LuauTypeInferRecursionLimit{"LuauTypeInferRecursionLimit", 90};
-=======
     ScopedFastInt LuauTypeInferRecursionLimit{FInt::LuauTypeInferRecursionLimit, 100};
->>>>>>> upstream
 #endif
 };