diff options
| author |  Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-21 16:35:38 +0100 |
|---|---|---|
| committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-21 16:36:19 +0100 |
| commit | 93137229bf3b04e4589ae315a81ed2de7a171ded (patch) | |
| tree | 703432658a50425e2a295f527c9fdb392211bfd3 /packages/forms/src/label/index.tsx | |
| parent | add workspaces count badge in settings navigation (diff) | |
| download | ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.tar.gz ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.tar.zst ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.zip | |
fix merge conflicts with latest develop
Diffstat (limited to 'packages/forms/src/label/index.tsx')
| -rw-r--r-- | packages/forms/src/label/index.tsx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/forms/src/label/index.tsx b/packages/forms/src/label/index.tsx index 36fcfbedf..590270a06 100644 --- a/packages/forms/src/label/index.tsx +++ b/packages/forms/src/label/index.tsx | |||
| @@ -26,6 +26,8 @@ class LabelComponent extends Component<ILabel> { | |||
| 26 | htmlFor, | 26 | htmlFor, |
| 27 | } = this.props; | 27 | } = this.props; |
| 28 | 28 | ||
| 29 | if (!showLabel) return children; | ||
| 30 | |||
| 29 | return ( | 31 | return ( |
| 30 | <label | 32 | <label |
| 31 | className={classnames({ | 33 | className={classnames({ |