merge

@@ -175,11 +175,7 @@ export default {
             max-width: 188px;
             line-height: 28px;
             margin-top: 24px;
-<<<<<<< HEAD
             font-family: "SanFranciscoText-Regular";
-=======
-            font-family: HelveticaNeue, Tahoma, Arial, HiraginoSansGB-W3, "PingFang SC", "Heiti SC";
->>>>>>> feature/leftScrollMore
 
             &.price {
                 font-size: 28px;