resolved conflict

2023-07-05 15:46:20 +05:30 · 2023-07-05 15:46:20 +05:30 · 94916d3b35
parent 8bc80fd28f
commit 94916d3b35
1 changed files with 1 additions and 0 deletions
--- 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