From 2737faf979087cd56b75263d8ec0e6a5b330c922 Mon Sep 17 00:00:00 2001
From: Vasek Mlejnsky <vasek.mlejnsky@gmail.com>
Date: Tue, 14 Aug 2018 21:37:52 +0200
Subject: [PATCH] Resolve merge

---
 src/js/components/wallet/pages/Acquire.js | 2 --
 src/js/support/BaseStyles.js              | 6 +++---
 src/styles/receive.less                   | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/js/components/wallet/pages/Acquire.js b/src/js/components/wallet/pages/Acquire.js
index cd3f6f06..dd0a28ae 100644
--- a/src/js/components/wallet/pages/Acquire.js
+++ b/src/js/components/wallet/pages/Acquire.js
@@ -1,6 +1,4 @@
 /* @flow */
-
-
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
diff --git a/src/js/support/BaseStyles.js b/src/js/support/BaseStyles.js
index 7c2f0523..f3f6ef71 100644
--- a/src/js/support/BaseStyles.js
+++ b/src/js/support/BaseStyles.js
@@ -33,9 +33,9 @@ const baseStyles = () => injectGlobal`
         cursor: pointer;
     }
 
-    a:focus, 
-    button:focus, 
-    input:focus, 
+    a:focus,
+    button:focus,
+    input:focus,
     textarea:focus {
         outline: 0;
     }
diff --git a/src/styles/receive.less b/src/styles/receive.less
index 62ff8054..ba6f94e3 100644
--- a/src/styles/receive.less
+++ b/src/styles/receive.less
@@ -57,7 +57,7 @@
                     padding-right: 4px;
                 }
             }
-            
+
         }
 
         &.hidden {
@@ -117,7 +117,7 @@
             }
         }
 
-        
+
     }
 
     .qr {