Fix merge conflict

Author: davidbonting

src/App.vue

@@ -8,21 +8,12 @@
 
 <style lang="scss">
 #app {
-<<<<<<< Updated upstream
-  font-family: "Avenir", Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-align: center;
-  color: #2c3e50;
-  min-height: 100vh;
-=======
 	font-family: "Avenir", Helvetica, Arial, sans-serif;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 	text-align: center;
 	color: #2c3e50;
 	min-height: 100vh;
->>>>>>> Stashed changes
 
 	.container {
 		min-height: 100vh;