ok

70deed81 · 周远喜 · b7f7b50d · 70deed81
Commit 70deed81 authored Apr 24, 2020 by 周远喜
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

iview-reset.less assets/css/iview-reset.less +0 -6

No files found.
--- a/assets/css/iview-reset.less
+++ b/assets/css/iview-reset.less
@@ -339,12 +339,6 @@
        color: #fff;
    }
 }
-<<<<<<< HEAD
-// .ivu-select-dropdown{
-//     z-index: 910!important;
-// }
-=======
->>>>>>> 0783264b39c101d895bac10d6ee7ec375f8653a3
 .manyTabs {
    .ivu-tabs-bar {
        position: absolute;