diff options
| author | Claude <noreply@anthropic.com> | 2026-05-20 19:46:27 +0000 |
|---|---|---|
| committer | Claude <noreply@anthropic.com> | 2026-05-20 19:46:27 +0000 |
| commit | 7239d5ecb8c5fb80e68ddac72e88d1ef2116fcd5 (patch) | |
| tree | 666f1b64d32fb398d270a7518d5dca97dea4075a /android-app/app/src/main | |
| parent | 48ad5dca0452689de86b7edf0b6638fe7c5c7025 (diff) | |
Fix XML conflict markers left in layout_track_detail_sheet.xml
https://claude.ai/code/session_01YUbuZNDAoLea4cf9UGQ9qn
Diffstat (limited to 'android-app/app/src/main')
| -rw-r--r-- | android-app/app/src/main/res/layout/layout_track_detail_sheet.xml | 4 |
1 files changed, 0 insertions, 4 deletions
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" |