From f2903e97805903b815463d56411d9475ab67523c Mon Sep 17 00:00:00 2001 From: FunkyMuse Date: Thu, 12 Oct 2023 16:18:39 +0200 Subject: [PATCH] fix: conflicts --- .../commons/dialogs/OpenDeviceSettingsDialog.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/OpenDeviceSettingsDialog.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/OpenDeviceSettingsDialog.kt index b256b37b7..3e8e745f1 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/OpenDeviceSettingsDialog.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/OpenDeviceSettingsDialog.kt @@ -10,8 +10,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.sp import com.simplemobiletools.commons.R import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.compose.alert_dialog.AlertDialogState -import com.simplemobiletools.commons.compose.alert_dialog.rememberAlertDialogState +import com.simplemobiletools.commons.compose.alert_dialog.* import com.simplemobiletools.commons.compose.extensions.MyDevices import com.simplemobiletools.commons.compose.theme.AppThemeSurface import com.simplemobiletools.commons.databinding.DialogOpenDeviceSettingsBinding