diff options
| author |  Dominik Guzei <dominik.guzei@gmail.com> | 2019-02-26 15:38:20 +0100 |
|---|---|---|
| committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-02-26 15:38:20 +0100 |
| commit | b5ad31e316c1074cfa6f57f83e262a607eda9d44 (patch) | |
| tree | affcfbc28b8892388ab23d97415902edfc682cab /src/features/basicAuth/Component.js | |
| parent | finish basic workspace settings (diff) | |
| parent | remove unused packages (diff) | |
| download | ferdium-app-b5ad31e316c1074cfa6f57f83e262a607eda9d44.tar.gz ferdium-app-b5ad31e316c1074cfa6f57f83e262a607eda9d44.tar.zst ferdium-app-b5ad31e316c1074cfa6f57f83e262a607eda9d44.zip | |
fixes merge conflicts with latest develop
Diffstat (limited to 'src/features/basicAuth/Component.js')
| -rw-r--r-- | src/features/basicAuth/Component.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/features/basicAuth/Component.js b/src/features/basicAuth/Component.js index 13395fb40..a8252acb7 100644 --- a/src/features/basicAuth/Component.js +++ b/src/features/basicAuth/Component.js | |||
| @@ -62,6 +62,7 @@ export default @injectSheet(styles) @observer class BasicAuthModal extends Compo | |||
| 62 | isOpen={isModalVisible} | 62 | isOpen={isModalVisible} |
| 63 | className={classes.modal} | 63 | className={classes.modal} |
| 64 | close={this.cancel.bind(this)} | 64 | close={this.cancel.bind(this)} |
| 65 | showClose={false} | ||
| 65 | > | 66 | > |
| 66 | <h1>Sign in</h1> | 67 | <h1>Sign in</h1> |
| 67 | <p> | 68 | <p> |