Merge pull request #3 from hackmdio/feature/bundle-merge-addon

jackycute · web-flow · commit 8ce8e8820da8 · 2019-05-06T09:54:16.000-04:00
Bundle merge addon
diff --git a/release.cmd b/release.cmd
@@ -29,6 +29,7 @@ addon\fold\brace-fold.js ^
 addon\fold\foldgutter.js ^
 addon\fold\markdown-fold.js ^
 addon\fold\xml-fold.js ^
+addon\merge\merge.js ^
 mode\xml\xml.js ^
 mode\markdown\markdown_math.js ^
 mode\gfm\gfm.js ^
diff --git a/release.sh b/release.sh
@@ -37,6 +37,7 @@ addon/fold/brace-fold.js \
 addon/fold/foldgutter.js \
 addon/fold/markdown-fold.js \
 addon/fold/xml-fold.js \
+addon/merge/merge.js \
 mode/xml/xml.js \
 mode/markdown/markdown_math.js \
 mode/gfm/gfm.js \
