diff options
| author | Iván Ávalos <avalos@disroot.org> | 2022-01-17 23:46:13 -0600 |
|---|---|---|
| committer | Iván Ávalos <avalos@disroot.org> | 2022-01-17 23:46:13 -0600 |
| commit | 675eb2739105e53a8f5f0f602b3c2b2206d28623 (patch) | |
| tree | 183b82c471e611d6de0390270e690e238265b149 /androidApp/src/main/res/layout/unit_details_reports.xml | |
| parent | 9ff880b37f3e44aa3edbd402c8c01aed5467e26a (diff) | |
| parent | 9325b6e0de41e8446bb6ce66915fb0c9fe0de4f3 (diff) | |
| download | etbsa-trackermap-mobile-675eb2739105e53a8f5f0f602b3c2b2206d28623.tar.gz etbsa-trackermap-mobile-675eb2739105e53a8f5f0f602b3c2b2206d28623.tar.bz2 etbsa-trackermap-mobile-675eb2739105e53a8f5f0f602b3c2b2206d28623.zip | |
Merge branch 'main' of https://git.sr.ht/~avalos/trackermap-mobile
Conflicts:
androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
Diffstat (limited to 'androidApp/src/main/res/layout/unit_details_reports.xml')
| -rw-r--r-- | androidApp/src/main/res/layout/unit_details_reports.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/androidApp/src/main/res/layout/unit_details_reports.xml b/androidApp/src/main/res/layout/unit_details_reports.xml index 7210e1f..f53ce51 100644 --- a/androidApp/src/main/res/layout/unit_details_reports.xml +++ b/androidApp/src/main/res/layout/unit_details_reports.xml @@ -7,7 +7,6 @@ <androidx.fragment.app.FragmentContainerView android:id="@+id/reportsMapContainer" - android:name="mx.trackermap.TrackerMap.android.map.MapFragment" android:layout_width="0dp" android:layout_height="0dp" android:layout_marginBottom="@dimen/margin" |