From c14a9a9ec953764c0426bd8801440cdbaa04a168 Mon Sep 17 00:00:00 2001
From: Johan Kwarnmark <johan.kwarnmark@symphony.com>
Date: Tue, 10 Nov 2020 16:40:18 +0100
Subject: [PATCH] sda-2270 removed merge problem line

---
 src/renderer/components/about-app.tsx | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/renderer/components/about-app.tsx b/src/renderer/components/about-app.tsx
index b0ac0ab1..6bb2dd67 100644
--- a/src/renderer/components/about-app.tsx
+++ b/src/renderer/components/about-app.tsx
@@ -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');
         }
     }