no message

src/views/test/test.vue

@@ -1,5 +1,4 @@
 <script setup>
-<<<<<<< HEAD
 
 	import cqjcyj from "./components/cqjcyj.vue"; 
 	import cqzrqs from "./components/cqzrqs.vue";