解决合并的dev和master时package-lock.json冲突
Showing
| ... | ... | @@ -31,6 +31,8 @@ |
| "jspdf": "^2.3.0", | ||
| "ng-zorro-antd-mobile": "^0.12.5", | ||
| "ngx-echarts": "^3.2.0", | ||
| "ngx-ueditor": "^2.1.3", | ||
| "node-sass": "^4.14.1", | ||
| "rxjs": "~6.3.3", | ||
| "save": "^2.4.0", | ||
| "signature_pad": "^3.0.0-beta.4", | ||
| ... | ... | @@ -39,7 +41,7 @@ |
| "zone.js": "~0.8.26" | ||
| }, | ||
| "devDependencies": { | ||
| "@angular-devkit/build-angular": "~0.13.0", | ||
| "@angular-devkit/build-angular": "^0.13.10", | ||
| "@angular/cli": "^7.3.9", | ||
| "@angular/compiler-cli": "~7.2.0", | ||
| "@angular/language-service": "~7.2.0", | ||
| ... | ... |
src/app/my/article/article.component.html
0 → 100644
src/app/my/article/article.component.scss
0 → 100644
src/app/my/article/article.component.spec.ts
0 → 100644
src/app/my/article/article.component.ts
0 → 100644
src/assets/images/welcome_header.jpg
0 → 100644
408 KB
184 Bytes
1.15 KB
1.57 KB
1.61 KB
1.09 KB
1.2 KB
518 Bytes
253 Bytes
175 Bytes
370 Bytes
177 Bytes
938 Bytes
4.18 KB
111 Bytes
3.66 KB
20.5 KB
19.2 KB
3.13 KB
734 Bytes
1.04 KB
216 Bytes
54 Bytes
167 Bytes
2.78 KB
43 Bytes
122 Bytes
1.8 KB
16.9 KB
170 Bytes
111 Bytes
6.45 KB
1.57 KB
1019 Bytes
6.32 KB
src/assets/ueditor/themes/iframe.css
0 → 100644
Please
register
or
sign in
to comment