Skip to content
Snippets Groups Projects
Commit e8b589a3 authored by Torsten Grote's avatar Torsten Grote
Browse files

Merge branch 'fix-imports' into 'main'

Fix stale import caused by merge race

See merge request !173
parents 68128fb0 cdb237f3
No related branches found
No related tags found
1 merge request!173Fix stale import caused by merge race
Pipeline #14523 passed
...@@ -13,7 +13,6 @@ import kotlinx.coroutines.launch ...@@ -13,7 +13,6 @@ import kotlinx.coroutines.launch
import org.briarproject.mailbox.R import org.briarproject.mailbox.R
import org.briarproject.mailbox.android.ui.MailboxViewModel import org.briarproject.mailbox.android.ui.MailboxViewModel
import org.briarproject.mailbox.core.settings.SettingsManager import org.briarproject.mailbox.core.settings.SettingsManager
import org.briarproject.mailbox.core.system.LocationUtils
import org.briarproject.mailbox.core.tor.NetworkManager import org.briarproject.mailbox.core.tor.NetworkManager
import org.briarproject.mailbox.core.tor.TorConstants.BRIDGE_AUTO import org.briarproject.mailbox.core.tor.TorConstants.BRIDGE_AUTO
import org.briarproject.mailbox.core.tor.TorConstants.BRIDGE_AUTO_DEFAULT import org.briarproject.mailbox.core.tor.TorConstants.BRIDGE_AUTO_DEFAULT
...@@ -30,6 +29,7 @@ import org.briarproject.onionwrapper.CircumventionProvider.BridgeType.MEEK ...@@ -30,6 +29,7 @@ import org.briarproject.onionwrapper.CircumventionProvider.BridgeType.MEEK
import org.briarproject.onionwrapper.CircumventionProvider.BridgeType.NON_DEFAULT_OBFS4 import org.briarproject.onionwrapper.CircumventionProvider.BridgeType.NON_DEFAULT_OBFS4
import org.briarproject.onionwrapper.CircumventionProvider.BridgeType.SNOWFLAKE import org.briarproject.onionwrapper.CircumventionProvider.BridgeType.SNOWFLAKE
import org.briarproject.onionwrapper.CircumventionProvider.BridgeType.VANILLA import org.briarproject.onionwrapper.CircumventionProvider.BridgeType.VANILLA
import org.briarproject.onionwrapper.LocationUtils
import javax.inject.Inject import javax.inject.Inject
@AndroidEntryPoint @AndroidEntryPoint
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment