mirror of
https://github.com/desktop/desktop
synced 2024-09-13 21:31:32 +00:00
Update ConflictsDialog dialog to use dismissDisabled instead
This commit is contained in:
parent
1860a82b32
commit
d20fbf6591
|
@ -243,7 +243,7 @@ export class ConflictsDialog extends React.Component<
|
|||
return (
|
||||
<Dialog
|
||||
id="conflicts-dialog"
|
||||
dismissable={!this.state.isCommitting}
|
||||
dismissDisabled={this.state.isCommitting}
|
||||
onDismissed={this.props.onDismissed}
|
||||
onSubmit={this.onSubmit}
|
||||
title={headerTitle}
|
||||
|
|
Loading…
Reference in a new issue