修复

810a107a · yanju · 20f6804d · 810a107a
Commit 810a107a authored Feb 10, 2020 by yanju
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

pages/blog/release/index.vue
+0 -4

No files found.
--- a/pages/blog/release/index.vue
+++ b/pages/blog/release/index.vue
@@ -194,10 +194,6 @@
      toDetail(){
        this.$router.push('/detail')
      },
-<<<<<<< HEAD
-
-=======
->>>>>>> ad73e16e073e5d5d4eb0a2043fbabfd8ef19b73b
      // 获得下拉框得内容
      handleBlogClass(value) {
        this.blogClass = value.tag;