diff options
author | Isidro Henoch <imhenoch@protonmail.com> | 2022-01-03 13:55:58 -0600 |
---|---|---|
committer | Isidro Henoch <imhenoch@protonmail.com> | 2022-01-03 13:55:58 -0600 |
commit | 1c94fbca0faebea6d005a92a53e7885e3ddd7dc6 (patch) | |
tree | 5567d2c823e0d28627f67738d07b810a65a2a0eb /androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt | |
parent | 4196352a52eba7e9148cbab6e12d7bafb0f07d88 (diff) | |
parent | 84fd0a97d775b88ef03c3161bbe126032ace8238 (diff) | |
download | etbsa-trackermap-mobile-1c94fbca0faebea6d005a92a53e7885e3ddd7dc6.tar.gz etbsa-trackermap-mobile-1c94fbca0faebea6d005a92a53e7885e3ddd7dc6.tar.bz2 etbsa-trackermap-mobile-1c94fbca0faebea6d005a92a53e7885e3ddd7dc6.zip |
Merge branch 'reports'
# Conflicts:
# androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt
# androidApp/src/main/res/values/strings.xml
Diffstat (limited to 'androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt')
-rw-r--r-- | androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt index 33dd5b9..b38b20b 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt @@ -84,4 +84,4 @@ class DevicesAdapter( override fun getItemCount(): Int = units.size inner class ViewHolder(val binding: UnitItemBinding) : RecyclerView.ViewHolder(binding.root) -}
\ No newline at end of file +} |