Browse Source

fix: 解决冲突

feat^2
xuesinan 4 years ago
parent
commit
5374cdbb6d
  1. 1
      .drone.yml
  2. 1
      CHANGELOG.md
  3. 8
      manifest.json

1
.drone.yml

@ -34,6 +34,7 @@ steps:
- name: cache
path: /root/.m2
commands:
- npm config set registry http://registry.npm.taobao.org
- npm i
- npm run build:dev

1
CHANGELOG.md

@ -53,6 +53,7 @@
### 🔨 代码重构
范围|描述|commitId
--|--|--
- | 项目列表 | [0486e98](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0486e98)
- | 重构project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df)
- | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87)

8
manifest.json

@ -1,6 +1,6 @@
{
"name" : "tall-4-project",
"appid" : "__UNI__1EC8558",
"name" : "时物链条",
"appid" : "__UNI__3CBCFFF",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
@ -43,7 +43,9 @@
/* ios */
"ios" : {},
/* SDK */
"sdkConfigs" : {}
"sdkConfigs" : {
"ad" : {}
}
}
},
/* */

Loading…
Cancel
Save