diff options
| author |  Dominik Guzei <dominik.guzei@gmail.com> | 2019-02-22 17:15:56 +0100 |
|---|---|---|
| committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-02-22 17:15:56 +0100 |
| commit | 9f0a77af747060a42bd8789672fb2f2a870636d8 (patch) | |
| tree | cb242d6c8b1c6b875b98bf04a751bcdc7202ce3a /packages | |
| parent | merge-in latest develop (diff) | |
| download | ferdium-app-9f0a77af747060a42bd8789672fb2f2a870636d8.tar.gz ferdium-app-9f0a77af747060a42bd8789672fb2f2a870636d8.tar.zst ferdium-app-9f0a77af747060a42bd8789672fb2f2a870636d8.zip | |
fix merge conflict
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/forms/src/input/index.tsx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/packages/forms/src/input/index.tsx b/packages/forms/src/input/index.tsx index 68bb5ac57..6be29e6e5 100644 --- a/packages/forms/src/input/index.tsx +++ b/packages/forms/src/input/index.tsx | |||
| @@ -109,11 +109,8 @@ class InputComponent extends Component<IProps, IState> { | |||
| 109 | placeholder, | 109 | placeholder, |
| 110 | spellCheck, | 110 | spellCheck, |
| 111 | onBlur, | 111 | onBlur, |
| 112 | <<<<<<< HEAD | ||
| 113 | onEnterKey, | 112 | onEnterKey, |
| 114 | ======= | ||
| 115 | onFocus, | 113 | onFocus, |
| 116 | >>>>>>> develop | ||
| 117 | } = this.props; | 114 | } = this.props; |
| 118 | 115 | ||
| 119 | const { | 116 | const { |