From 1186795ace3075e309f984182951f47212786444 Mon Sep 17 00:00:00 2001
From: Ariel Costas Guerrero <ariel@costas.dev>
Date: Fri, 7 Nov 2025 10:48:16 +0100
Subject: Fix shit

---
 src/frontend/app/components/StopSheetSkeleton.tsx | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'src/frontend/app/components/StopSheetSkeleton.tsx')

diff --git a/src/frontend/app/components/StopSheetSkeleton.tsx b/src/frontend/app/components/StopSheetSkeleton.tsx
index 36ce546..0ae83b8 100644
--- a/src/frontend/app/components/StopSheetSkeleton.tsx
+++ b/src/frontend/app/components/StopSheetSkeleton.tsx
@@ -59,22 +59,11 @@ export const StopSheetSkeleton: React.FC<StopSheetSkeletonProps> = ({
             <Skeleton width="70px" height="0.85rem" />
           </div>
 
-<<<<<<< HEAD
           <div className="stop-sheet-view-all" style={{
             background: "var(--service-background)",
             cursor: "not-allowed",
             pointerEvents: "none"
           }}>
-=======
-          <div
-            className="stop-sheet-view-all"
-            style={{
-              background: "#f0f0f0",
-              cursor: "not-allowed",
-              pointerEvents: "none",
-            }}
-          >
->>>>>>> 88e0621 (Improve gallery scroll indicators and format code)
             <Skeleton width="180px" height="0.85rem" />
           </div>
         </div>
-- 
cgit v1.3