解决冲突

src/views/boutique/components/jyycc/index.vue

@@ -516,11 +516,7 @@ export default {
       }
       .detail {
         width: 100%;
-<<<<<<< HEAD:src/views/boutique/components/jyycc/index.vue
-        background-image: url("@/assets/imgs/topic/jyycc/part1-bg.png");
-=======
         background-image: url('@/assets/imgs/topic/jyycc-10/part1-bg.png');
->>>>>>> c7c929faab87677c988370f44cf76d97ad371ca9:src/views/boutique/components/jyycc.vue
         background-repeat: repeat;
         background-size: cover;
         > div.txt {