diff --git a/f/web-kboss/.gitignore b/f/web-kboss/.gitignore index 62e44d3..296c744 100644 --- a/f/web-kboss/.gitignore +++ b/f/web-kboss/.gitignore @@ -1,10 +1,8 @@ .DS_Store node_modules/ dist/ -<<<<<<< HEAD ======= # src/ ->>>>>>> a3d0bd5845e8b37373bf85c7c40401a7c67884b9 npm-debug.log* yarn-debug.log* yarn-error.log* diff --git a/f/web-kboss/src/views/homePage/ncmatch/search/index.vue b/f/web-kboss/src/views/homePage/ncmatch/search/index.vue index 2afc23a..04e8399 100644 --- a/f/web-kboss/src/views/homePage/ncmatch/search/index.vue +++ b/f/web-kboss/src/views/homePage/ncmatch/search/index.vue @@ -2,8 +2,8 @@
- +
@@ -24,7 +24,7 @@