Skip to content

Commit 6779253

Browse files
Resolved more merge conflicts after rebase
1 parent d1bcff7 commit 6779253

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

src/components/TextInput/BaseTextInput/implementation/index.native.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -376,12 +376,7 @@ function BaseTextInput(
376376
ref.current = baseTextInputRef;
377377
}
378378

379-
<<<<<<< HEAD
380379
input.current = element;
381-
=======
382-
const elementRef = element as AnimatedTextInputRef | AnimatedMarkdownTextInputRef | null;
383-
input.current = elementRef;
384-
>>>>>>> 7acd72ff71c (Prettier run)
385380
}}
386381
// eslint-disable-next-line
387382
{...inputProps}

0 commit comments

Comments
 (0)