From abc14175c859faf5bdf9c6a346a118f716644d00 Mon Sep 17 00:00:00 2001
From: Hironori Fujimoto <broadbarredfirefish@gmail.com>
Date: Tue, 1 May 2018 09:51:50 +0900
Subject: [PATCH] =?utf8?q?master=E3=83=96=E3=83=A9=E3=83=B3=E3=83=81?=
 =?utf8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index 4e52ade..709403d 100755
--- 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}
-- 
2.11.0