From 7239d5ecb8c5fb80e68ddac72e88d1ef2116fcd5 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 20 May 2026 19:46:27 +0000
Subject: Fix XML conflict markers left in layout_track_detail_sheet.xml

https://claude.ai/code/session_01YUbuZNDAoLea4cf9UGQ9qn
---
 android-app/app/src/main/res/layout/layout_track_detail_sheet.xml | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'android-app/app/src')

diff --git a/android-app/app/src/main/res/layout/layout_track_detail_sheet.xml b/android-app/app/src/main/res/layout/layout_track_detail_sheet.xml
index fafd75a..993edf8 100644
--- a/android-app/app/src/main/res/layout/layout_track_detail_sheet.xml
+++ b/android-app/app/src/main/res/layout/layout_track_detail_sheet.xml
@@ -6,9 +6,6 @@
     android:orientation="vertical"
     android:background="?attr/colorSurface">
 
-<<<<<<< Updated upstream
-    <!-- Header -->
-=======
     <!-- Track map — top half -->
     <org.maplibre.android.maps.MapView
         android:id="@+id/track_map_view"
@@ -17,7 +14,6 @@
         android:layout_weight="1" />
 
     <!-- Detail panel — bottom half -->
->>>>>>> Stashed changes
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
-- 
cgit v1.2.3