From 42a088803d3e10bf16bef8112ccee2fda4dd8251 Mon Sep 17 00:00:00 2001
From: Alexander Eggers <alex.eggers@myzeller.com>
Date: Wed, 14 Jun 2023 20:38:44 +1000
Subject: [PATCH] resolve some merge conflicts

---
 Libraries/Components/TextInput/TextInput.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
index 542e8ba3088..b871ea4a791 100644
--- a/Libraries/Components/TextInput/TextInput.js
+++ b/Libraries/Components/TextInput/TextInput.js
@@ -1428,7 +1428,7 @@ function InternalTextInput(props: Props): React.Node {
     textInput = (
       <RCTTextInputView
         ref={_setNativeRef}
-        {...props}
+        {...otherProps}
         {...eventHandlers}
         accessibilityState={_accessibilityState}
         accessible={accessible}
@@ -1478,7 +1478,7 @@ function InternalTextInput(props: Props): React.Node {
        * fixed */
       <AndroidTextInput
         ref={_setNativeRef}
-        {...props}
+        {...otherProps}
         {...eventHandlers}
         accessibilityState={_accessibilityState}
         accessibilityLabelledBy={_accessibilityLabelledBy}