my answer

pages/index.vue

@@ -7,11 +7,8 @@
       </h1>
       <project-card></project-card>
       <answer-card></answer-card>
-<<<<<<< HEAD
       <my-answer></my-answer>
       <topic-list-card></topic-list-card>
-=======
->>>>>>> d906be37237577d26fe2e86d689843a535493699
       <h2 class="subtitle" @click="showAlert">
         beyond-clouds project
       </h2>
@@ -24,11 +21,8 @@
 import Banner from '../components/pc/banner';
 import ProjectCard from '../components/pc/projectCard';
 import AnswerCard from '../components/pc/answerCard';
-<<<<<<< HEAD
 import MyAnswer from '../components/pc/myAnswer';
 import TopicListCard from '../components/pc/topicListCard';
-=======
->>>>>>> d906be37237577d26fe2e86d689843a535493699
 
 export default {
 
@@ -38,11 +32,7 @@ export default {
     }
   },
   components:{
-<<<<<<< HEAD
     Banner,ProjectCard,AnswerCard,MyAnswer,TopicListCard
-=======
-    Banner,ProjectCard,AnswerCard
->>>>>>> d906be37237577d26fe2e86d689843a535493699
   },
 
   methods:{