fix: conflicts
This commit is contained in:
parent
0345d07717
commit
f2903e9780
1 changed files with 1 additions and 2 deletions
|
@ -10,8 +10,7 @@ import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
import com.simplemobiletools.commons.R
|
import com.simplemobiletools.commons.R
|
||||||
import com.simplemobiletools.commons.activities.BaseSimpleActivity
|
import com.simplemobiletools.commons.activities.BaseSimpleActivity
|
||||||
import com.simplemobiletools.commons.compose.alert_dialog.AlertDialogState
|
import com.simplemobiletools.commons.compose.alert_dialog.*
|
||||||
import com.simplemobiletools.commons.compose.alert_dialog.rememberAlertDialogState
|
|
||||||
import com.simplemobiletools.commons.compose.extensions.MyDevices
|
import com.simplemobiletools.commons.compose.extensions.MyDevices
|
||||||
import com.simplemobiletools.commons.compose.theme.AppThemeSurface
|
import com.simplemobiletools.commons.compose.theme.AppThemeSurface
|
||||||
import com.simplemobiletools.commons.databinding.DialogOpenDeviceSettingsBinding
|
import com.simplemobiletools.commons.databinding.DialogOpenDeviceSettingsBinding
|
||||||
|
|
Loading…
Reference in a new issue