From f1a22133efc806386f516ae32d1db74a363c6430 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 19 Mar 2025 12:19:44 -0700
Subject: [PATCH] fix merge conflict

---
 src/Pages/Uptime/Details/Components/ResponseTable/index.jsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Pages/Uptime/Details/Components/ResponseTable/index.jsx b/src/Pages/Uptime/Details/Components/ResponseTable/index.jsx
index 4adfc68aa..4d482aa07 100644
--- a/src/Pages/Uptime/Details/Components/ResponseTable/index.jsx
+++ b/src/Pages/Uptime/Details/Components/ResponseTable/index.jsx
@@ -17,12 +17,8 @@ const ResponseTable = ({
 	rowsPerPage,
 	setRowsPerPage,
 }) => {
-<<<<<<< Updated upstream
 	const { t } = useTranslation();
-	if (!shouldRender) {
-=======
 	if (isLoading) {
->>>>>>> Stashed changes
 		return <SkeletonLayout />;
 	}