diff --git a/README.md b/README.md index 1e8693d..f776f87 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,7 @@ rebase # squash尝试 ## 1 -## 2 \ No newline at end of file +## 2 + +# 推送到dev-jeson并pull request到dev, 但未合并到dev +## 1 \ No newline at end of file diff --git a/babel.config.js b/babel.config.js index 1452cd2..310830c 100644 --- a/babel.config.js +++ b/babel.config.js @@ -11,4 +11,10 @@ module.exports = { * 1. 远端dev变动 * 2 * + */ + +/** + * 推送到dev-jeson并pull request到dev, 但未合并到dev + * 1 + * */ \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index dcb5e0a..42420fe 100644 --- a/vue.config.js +++ b/vue.config.js @@ -9,4 +9,10 @@ module.exports = defineConfig({ * squash * 1 * 2 + */ + +/** + * 推送到dev-jeson并pull request到dev, 但未合并到dev + * 1 + * */ \ No newline at end of file