Merge branch 'dev' of https://github.com/uiwjs/react-native-uiw into dev

uiwjs · Feb 25, 2023 · 7b80d53 · 7b80d53
2 parents a3fe38b + fbcc03a
commit 7b80d53
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/packages/core/src/Input/README.md b/packages/core/src/Input/README.md
@@ -161,8 +161,5 @@ export default Demo
 | `style` | 输入框样式 | `StyleProp<TextStyle>` | - |
 | `containerStyle` | 容器样式 | `StyleProp<ViewStyle>` | - |
 
-<<<<<<< HEAD
 
 > 更多 react-native Input 属性请参考 react-native TextInput (https://www.react-native.cn/docs/textinput)
-=======
->>>>>>> dev