解决冲突

src/views/parameter/LinkUpload.vue

@@ -245,14 +245,7 @@ export default {
         this.$http({
           method: "post",
           url: "/base/mediaPublishManager/deleteMediaPublishInfo",
-<<<<<<< HEAD
-          data,
-=======
-          data: {
-            id,
-            publishPlatformId
-          },
->>>>>>> 3c08653b6e480f6d34fe42e974506e5ba247278d
+          data
         })
           .then((res) => {
             if (res.data && res.data.code === 200) {