Bug 1825020 - Backport to 112 conflict resolution

1 year ago · 556b33b1cf
parent 811d8054aa
commit 556b33b1cf
1 changed files with 2 additions and 8 deletions
--- a/app/src/main/java/org/mozilla/fenix/ext/Activity.kt
+++ b/app/src/main/java/org/mozilla/fenix/ext/Activity.kt
@ -94,19 +94,13 @@ fun Activity.openSetDefaultBrowserOption(
            navigateToDefaultBrowserAppsSettings()
        }
        else -> {
-<<<<<<< HEAD
            (this as HomeActivity).openToBrowserAndLoad(
-                searchTermOrURL = SupportUtils.getSumoURLForTopic(
-                    this,
-                    SupportUtils.SumoTopic.SET_AS_DEFAULT_BROWSER,
+                searchTermOrURL = SupportUtils.getGenericSumoURLForTopic(
+                    topic = SupportUtils.SumoTopic.SET_AS_DEFAULT_BROWSER,
                ),
                newTab = true,
                from = from,
                flags = flags,
-=======
-            val sumoDefaultBrowserUrl = SupportUtils.getGenericSumoURLForTopic(
-                topic = SupportUtils.SumoTopic.SET_AS_DEFAULT_BROWSER,
->>>>>>> 79d1e43dc2 (Bug 1825020 - Update the SET_AS_DEFAULT_BROWSER breadcrumb and use getGenericSumoURLForTopic for Android <= M)
            )
        }
    }