From 94916d3b35f32d1476e226b2e24002532380edf7 Mon Sep 17 00:00:00 2001 From: Rawlin C Date: Wed, 5 Jul 2023 15:46:20 +0530 Subject: [PATCH] resolved conflict --- .../kotlin/com/simplemobiletools/clock/extensions/Context.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt index a7eaef78..4dc63988 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt @@ -36,6 +36,7 @@ import kotlinx.coroutines.withContext import java.text.SimpleDateFormat import java.util.Calendar import java.util.Date +import java.util.Locale import java.util.TimeZone import kotlin.math.pow import kotlin.time.Duration.Companion.minutes