Skip to content

Commit

Permalink
fix: fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@anlyyao
anlyyao committed Mar 30, 2023
1 parent bbd83a8 commit edd8645
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/_common
Submodule _common updated 11 files
+9 −6 docs/web/api/back-top.md
+2 −2 docs/web/api/sticky-tool.md
+3 −4 js/date-picker/format.ts
+0 −35 style/mobile/components/picker-item/v2/_index.less
+0 −6 style/mobile/components/picker-item/v2/_var.less
+29 −1 style/mobile/components/picker/v2/_index.less
+6 −0 style/mobile/components/picker/v2/_var.less
+12 −4 style/web/components/alert/_index.less
+6 −5 style/web/components/alert/_var.less
+6 −6 style/web/components/image-viewer/_index.less
+2 −0 style/web/components/loading/_index.less

0 comments on commit edd8645

Please sign in to comment.