feat: 代码合并

2 years ago · cd4b18e7ba
parent f38f1e24e1
commit cd4b18e7ba
1 changed files with 0 additions and 4 deletions
--- a/data-room-ui/packages/BigScreenDesign/LeftPanel.vue
+++ b/data-room-ui/packages/BigScreenDesign/LeftPanel.vue
@ -117,10 +117,6 @@
                        >
                          <use :xlink:href="`#icon-a-${element.icon}`" />
                        </svg> -->
-<<<<<<< HEAD
-=======
-                        {{ element.icon }}
->>>>>>> bac32cd20b683071d5697af079e34b69d4c316a8
                        <icon-svg
                          v-if="element.icon"
                          :name="element.icon"