no message

FrontEnd/components/home/headerInlineSearch.vue

@@ -374,13 +374,9 @@ export default {
     goToSearch() {
       this.$emit('loaading', true);
       this.$router.push(this.localePath(`/${this.type}?q=${this.inputs}`));
-<<<<<<< HEAD
-      // this.inputs = '';
-=======
       this.$nextTick(()=>{
         this.$emit('loaading', true);
       });
->>>>>>> 0633d5117b633a90753655bce0e0e68944a99fc4
     },
   },
   computed: {