Resolve merge

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';

src/js/support/BaseStyles.js

@@ -33,9 +33,9 @@ const baseStyles = () => injectGlobal`
         cursor: pointer;
     }
 
-    a:focus, 
+    a:focus,
-    button:focus, 
+    button:focus,
-    input:focus, 
+    input:focus,
     textarea:focus {
         outline: 0;
     }

src/styles/receive.less

@@ -57,7 +57,7 @@
                     padding-right: 4px;
                 }
             }
-            
+
         }
 
         &.hidden {
@@ -117,7 +117,7 @@
             }
         }
 
-        
+
     }
 
     .qr {