Merge branch 'SimpleMobileTools:master' into feat/multiple-timers

This commit is contained in:
Paul 2021-09-10 14:34:45 +01:00 committed by GitHub
commit d9a72b81a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -118,7 +118,7 @@ fun getAllTimeZones() = arrayListOf(
MyTimeZone(12, "GMT-06:00 Regina", "America/Regina"), MyTimeZone(12, "GMT-06:00 Regina", "America/Regina"),
MyTimeZone(13, "GMT-05:00 Bogota", "America/Bogota"), MyTimeZone(13, "GMT-05:00 Bogota", "America/Bogota"),
MyTimeZone(14, "GMT-05:00 New York", "America/New_York"), MyTimeZone(14, "GMT-05:00 New York", "America/New_York"),
MyTimeZone(15, "GMT-04:30 Caracas", "America/Caracas"), MyTimeZone(15, "GMT-04:00 Caracas", "America/Caracas"),
MyTimeZone(16, "GMT-04:00 Barbados", "America/Barbados"), MyTimeZone(16, "GMT-04:00 Barbados", "America/Barbados"),
MyTimeZone(17, "GMT-04:00 Halifax", "America/Halifax"), MyTimeZone(17, "GMT-04:00 Halifax", "America/Halifax"),
MyTimeZone(18, "GMT-04:00 Manaus", "America/Manaus"), MyTimeZone(18, "GMT-04:00 Manaus", "America/Manaus"),