diff --git a/src/api/attachment.js b/src/api/attachment.js
index 386bba7a..b5e02bc0 100644
--- a/src/api/attachment.js
+++ b/src/api/attachment.js
@@ -94,11 +94,7 @@ attachmentApi.type = {
   },
   TENCENTYUN: {
     type: 'tencentyun',
-<<<<<<< HEAD
-    text: '百度云'
-=======
     text: '腾讯云'
->>>>>>> dev
   }
 }