merge

2022-02-21 18:10:42 +08:00
parent 7220c3466d
commit 914f3f9371
2 changed files with 0 additions and 16 deletions
--- a/pages/im/group/reviewed.vue
+++ b/pages/im/group/reviewed.vue
@@ -138,7 +138,6 @@
        }

    }
-<<<<<<< HEAD

    .no-lists {
        padding-top: $padding * 5;
@@ -154,6 +153,4 @@
            padding-top: $padding;
        }
    }
-=======
->>>>>>> d8b90f97d110aed79b35d385dbc0eeb481ef4eab
 </style>