解决博客发布页面冲突

pages/blog/release/index.vue

@@ -382,15 +382,8 @@
         // filename: 写在md中的文件名
         // filename: 写在md中的文件名
         console.log(pos);
         console.log(pos);
       },
       },
-<<<<<<< pages/blog/release/index.vue
-
       save(value, render) {  //保存文章内容
       save(value, render) {  //保存文章内容
         this.content = render;
         this.content = render;
-=======
-      save(value, render) {  //保存文章内容
-        this.projectDetail = render;
-        console.log('save');
->>>>>>> pages/blog/release/index.vue
       },
       },
       intervalSave(value, render) {
       intervalSave(value, render) {
         // 自动保存
         // 自动保存
@@ -398,12 +391,7 @@
         let now = new Date();
         let now = new Date();
         if (now - this.lastSaveTime >= 2 * 1000) {
         if (now - this.lastSaveTime >= 2 * 1000) {
           this.lastSaveTime = now;
           this.lastSaveTime = now;
-<<<<<<< pages/blog/release/index.vue
           this.content = render;
           this.content = render;
-=======
-          this.projectDetail = render;
-          console.log('zdsava');
->>>>>>> pages/blog/release/index.vue
         }
         }
       },
       },