fix merge str

app/mycard.component.css

-<<<<<<< HEAD
 body {
     font-family: "Helvetica Neue", Helvetica, Arial, 'Source Sans Pro', "Microsoft YaHei", 'Microsoft JhengHei', "WenQuanYi Micro Hei", sans-serif;
 }
@@ -6,6 +5,7 @@ body {
 nav {
     -webkit-app-region: drag;
 }
+
 nav.darwin {
     padding-left: 80px;
 }
@@ -16,11 +16,14 @@ nav.darwin {
 
 .navbar-right > div, #user > .item {
     float: left;
-    margin: 0 0.5rem
+    margin: 0 0.5rem;
+}
+
 #wrapper {
     padding-top: 60px;
     /*margin-bottom: 60px;*/
 }
+
 .nav-right {
     float: right;
 }