From 31d9ad561d1dcf5fd0017e1f90bb62fdca3a539d Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 28 May 2019 11:05:58 +0800 Subject: [PATCH] Fix merge issue --- ext.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/ext.json b/ext.json index 7f4fe1f..9fcb600 100644 --- a/ext.json +++ b/ext.json @@ -7,7 +7,6 @@ "etcpVersion": "release", "etcpCallbackUrl": "https://ciformall.youlane.cn/api/carCallback/etcpPaidCallback", "ifHaveWebSocket": "0", -<<<<<<< HEAD "ifHaveCarModular": "1", "imgProxy": [ { @@ -23,14 +22,6 @@ "newUrl": "https://ciformall.youlane.cn/img2" } ] -======= - "ifHaveCarModular": "1", - "imgOrgUrl": "https://iformall-net.s3.cn-northwest-1.amazonaws.com.cn", - "imgOrgUrl2": "https://wx.qlogo.cn", - "imgOrgUrl1": "https://s3.cn-northwest-1.amazonaws.com.cn", - "imgNewUrl": "https://ciformall.youlane.cn/img", - "imgNewUrl1": "https://ciformall.youlane.cn/img1" ->>>>>>> [小程序生成海报][修改] }, "name": "富茂客官开发", "weappId": "wxea71200db93d756b",