代码冲突解决

src/css/informationOut.less

@@ -346,48 +346,6 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
   background: url("../images/link.png") 0 -2px no-repeat;
   background-size: 25px 25px;
 }
-<<<<<<< HEAD
-.footer{
-  width: 100%;
-  height: 52px;
-  background: #172238;
-  padding-top: 8px;
-  position: absolute;
-  bottom: 0;
-  z-index: 1;
-  p{
-    color:#fff;
-    text-align: center;
-    font-size: 12px;
-    white-space: nowrap;
-  }
-}
-
-.infos::-webkit-scrollbar, .anchors::-webkit-scrollbar {
-  /*滚动条整体样式*/
-  width: 6px;
-  height: 100px;
-  /*高宽分别对应横竖滚动条的尺寸*/
-  background: #ebeef5;
-  -webkit-box-shadow: inset 1px 0 1px rgba(0, 0, 0, 0.2);
-}
-
-.infos::-webkit-scrollbar-thumb, .anchors::-webkit-scrollbar-thumb {
-  /*滚动条里面小方块*/
-  width: 6px;
-  border-radius: 5px;
-  background: @staticMainColor;
-  height: 100px;
-}
-
-.infos::-webkit-scrollbar-track, .anchors::-webkit-scrollbar-track {
-  /*滚动条里面轨道*/
-  border-radius: 2px;
-  background: #f0f2f5;
-  opacity: .2;
-}
-=======
->>>>>>> dynamicScale0609
 
 .scaletitle{
   font-size: 20px;
@@ -406,11 +364,7 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
   margin-bottom: 6px;
   .item-list{
     padding: 0 21px;
-<<<<<<< HEAD
-    .item-title{
-=======
     .item-title,.item-titles{
->>>>>>> dynamicScale0609
       font-size: 14px;
       font-weight: 400;
       color: #333333;
@@ -460,10 +414,7 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
     font-size: 16px;
     font-weight: 400;
     color: #2A9BD5;
-<<<<<<< HEAD
-=======
     margin-right: 9px;
->>>>>>> dynamicScale0609
   }
   .score{
     font-size: 16px;