Bug 1833118 - Rename OnboardingPageState image to imageRes and update class desc @param to @Property

1 year ago · 2c62e3c711
parent e070a833f1
commit 2c62e3c711
1 changed files with 0 additions and 3 deletions
--- 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(