Rebase fixes

3 files changed, 6 insertions, 7 deletions

diff --git a/app/components/HeaderBar.js b/app/components/HeaderBar.js
index 254c4e56c0..d22771420b 100644
--- a/app/components/HeaderBar.js
+++ b/app/components/HeaderBar.js
@@ -4,7 +4,6 @@ import {
   Component,
   Text,
   Button,
-  Image,
   View
 } from 'reactxp';
 
@@ -47,7 +46,7 @@ export default class HeaderBar extends Component {
             <Img style={ styles.headerbar__logo } source='logo-icon'/>
             <Text style={styles.headerbar__title}>MULLVAD VPN</Text>
           </View>
-        : null}
+          : null}
 
         {this.props.showSettings ?
           <View style={styles.headerbar__settings}>
@@ -55,7 +54,7 @@ export default class HeaderBar extends Component {
               <Img style={ styles.headerbar__settings } source='icon-settings'/>
             </Button>
           </View>
-        : null}
+          : null}
       </View>
     );
   }
diff --git a/app/components/HeaderBarStyles.js b/app/components/HeaderBarStyles.js
index 1e93f5d68e..2a2a0812bd 100644
--- a/app/components/HeaderBarStyles.js
+++ b/app/components/HeaderBarStyles.js
@@ -55,9 +55,9 @@ const styles = {
     width: 24,
     height: 24,
     backgroundColor: 'transparent',
-  marginLeft: -6, //Because of button.css, when removed remove this
-  marginTop: -1, //Because of button.css, when removed remove this
-})
+    marginLeft: -6, //Because of button.css, when removed remove this
+    marginTop: -1, //Because of button.css, when removed remove this
+  })
 };
 
 module.exports = styles;
\ No newline at end of file
diff --git a/app/components/Img.js b/app/components/Img.js
index 280d072a29..637f66f08b 100644
--- a/app/components/Img.js
+++ b/app/components/Img.js
@@ -5,7 +5,7 @@ import { View, Component } from 'reactxp';
 export default class Img extends Component {
   render(){
 
-    const url = "./assets/images/" + this.props.source + ".svg";
+    const url = './assets/images/' + this.props.source + '.svg';
 
     const style = this.props.style;