修改冲突

src/widget/index.ts

@@ -28,10 +28,6 @@ export default (app: any)	=> {
 	app.component('SignatureMap', signatureMap)
 	app.component('VideoUpAndPlay',videoUpAndPlay)
 	app.component('LowcodeCarsusel',lowcodeCarsusel)
-<<<<<<< HEAD
-
-=======
 	app.component('LowcodeTransfer',lowcodeTransfer)
 	app.component('LowcodeImage',lowcodeImage)
->>>>>>> liwenxuan_v4
 }