解决冲突

src/views/chartShow/index.vue

@@ -103,12 +103,8 @@ export default defineComponent({
   components: {
     chart,
     collectBtn,
-<<<<<<< HEAD
     collectBtnHT,
     NoAuth
-=======
-    collectBtnHT
->>>>>>> eta_forum_2.0
   },
   setup() {
     const route = useRoute();