diff --git a/build/merge-with-main.sh b/build/merge-development.sh similarity index 100% rename from build/merge-with-main.sh rename to build/merge-development.sh diff --git a/package.json b/package.json index 1363b60a..8aaedd51 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "docs": "cd docs && bundle exec jekyll serve --incremental --host=`ipconfig getifaddr en0`", "docs-install": "cd docs && bundle install", "docs-update": "cd docs && bundle update", - "merge-with-main": "sh build/merge-with-main.sh", + "merge-development": "sh build/merge-development.sh", "make-x_ite-for-sunrize": "sh build/make-x_ite-for-sunrize.sh" }, "repository": {