From 0e773168e530a4f0a4a69944081514a2fe0e341a Mon Sep 17 00:00:00 2001
From: Lauri Nevala <lauri.nevala@gmail.com>
Date: Fri, 4 Sep 2020 12:47:14 +0300
Subject: [PATCH] Fix merge issue

Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
---
 src/renderer/components/+preferences/preferences.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/renderer/components/+preferences/preferences.tsx b/src/renderer/components/+preferences/preferences.tsx
index 3938023d71..a1b86c19cd 100644
--- a/src/renderer/components/+preferences/preferences.tsx
+++ b/src/renderer/components/+preferences/preferences.tsx
@@ -140,7 +140,6 @@ export class Preferences extends React.Component {
           />
           <small className="hint">
             <Trans>Proxy is used only for non-cluster communication.</Trans>
-          </small>Proxy is used only for non-cluster communication.</Trans>
           </small>
 
           <KubectlBinaries preferences={preferences} />