From 2c62e3c711ebb04c1f508d02d4f0a49990d3f3f3 Mon Sep 17 00:00:00 2001 From: t-p-white Date: Tue, 30 May 2023 13:57:27 +0100 Subject: [PATCH] Bug 1833118 - Rename OnboardingPageState image to imageRes and update class desc @param to @Property --- .../java/org/mozilla/fenix/onboarding/view/OnboardingPage.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPage.kt b/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPage.kt index cd9d4ea6e..42d5684b6 100644 --- a/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPage.kt +++ b/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPage.kt @@ -66,10 +66,7 @@ private const val URL_TAG = "URL_TAG" * @param modifier The modifier to be applied to the Composable. * @param onDismiss Invoked when the user clicks the close button. This defaults to null. When null, * it doesn't show the close button. -<<<<<<< HEAD -======= * @param imageResContentScale The [ContentScale] for the [OnboardingPageState.imageRes]. ->>>>>>> 19bd5c6685 (Bug 1833118 - Rename OnboardingPageState `image` to `imageRes` and update class desc @param to @property) */ @Composable fun OnboardingPage(