# Conflicts:
#   dist/index.html

# Conflicts:
#	dist/index.html
#	dist/static/css/main.28ca054f4ccddd8454a48c8049fb08d4.css
#	dist/static/css/main.61c64fc85501334f03240e6364776e5b.css
#	dist/static/css/main.ba3841b96070215fe0c2a17527bf9f30.css
#	src/router/index.js
#	src/utils/limiting.js

Dev

See merge request !65

fix:msg 文案

See merge request !64

# Conflicts:
#	dist/index.html
#	dist/static/css/main.35b5ff025b4d54e9c01de91dab923bc8.css
#	dist/static/css/main.675b3b8cbe39453a837c45c73bbe330b.css
#	dist/static/css/main.a133375d8f5538a1db50850095cd8c05.css
#	dist/static/js/manifest.d824dd9a9f21a1f1d363.js
#	src/views/card/form.js

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

# Conflicts:
#	dist/index.html