sda-2270 removed merge problem line

This commit is contained in:
Johan Kwarnmark 2020-11-10 16:40:18 +01:00
parent 9db457e1ef
commit c14a9a9ec9

View File

@ -130,13 +130,10 @@ export default class AboutApp extends React.Component<{}, IState> {
* Copies the version info on to the clipboard
*/
public copy(): void {
const data = this.state;
const { clientVersion, ...rest } = this.state;
const data = { ...{ sbeVersion: clientVersion }, ...rest };
if (data) {
const { clientVersion, ...rest } = this.state;
const data = { ...{ sbeVersion: clientVersion }, ...rest };
if (data) {
remote.clipboard.write({ text: JSON.stringify(data, null, 4) }, 'clipboard');
}
remote.clipboard.write({ text: JSON.stringify(data, null, 4) }, 'clipboard');
}
}