...

2022-02-21 18:01:11 +08:00
parent ee3087b320 d8b90f97d1
commit ca9f7e80ca
13 changed files with 196 additions and 185 deletions
--- a/pages/im/group/reviewed.vue
+++ b/pages/im/group/reviewed.vue
@@ -138,6 +138,7 @@
        }

    }
+<<<<<<< HEAD

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