diff --git a/src/assets/less/index.less b/src/assets/less/index.less
index 499268c..854af4e 100644
--- a/src/assets/less/index.less
+++ b/src/assets/less/index.less
@@ -1,17 +1,19 @@
-<<<<<<< HEAD
-.type-time{
+.type-time {
   text-align: right;
   padding-right: 4%;
   padding-top: 5%;
   font-size: 18px;
-  span{
+
+  span {
     padding: 0 2%;
     cursor: pointer;
   }
-  .select{
+
+  .select {
     color: #45A2FF;
     position: relative;
-    &:after{
+
+    &:after {
       content: '';
       position: absolute;
       display: block;
@@ -23,10 +25,11 @@
       background-size: 100% 100%;
     }
   }
-  .unSelect{
+
+  .unSelect {
     color: #A3A4A4;
   }
-=======
+}
 *::-webkit-scrollbar {
   width: 12px;
   height: 12px;
@@ -45,5 +48,4 @@
   border-radius: 25px;
   background-clip: padding-box;
   background-color: rgba(0, 0, 0, 0.30);
->>>>>>> 330154ae420452f6810cf7e7b439383c13ab5114
 }
\ No newline at end of file