masterブランチに変更

diff --git a/build.sh b/build.sh
index 4e52ade..709403d 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -17,8 +17,8 @@ git stash
 git stash clear
 echo 'リポジトリの更新・マージ'
 git fetch origin
-git checkout 1.14
-git merge origin/1.14
+git checkout master
+git merge origin/master
 
 if [ ! -d ${BUILD_DIR} ]; then
   mkdir ${BUILD_DIR}