From: Hironori Fujimoto <broadbarredfirefish@gmail.com>
Date: Tue, 1 May 2018 00:51:50 +0000 (+0900)
Subject: masterブランチに変更
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=HEAD;hp=b336828947da3a15fe1211fd83b17ed9c6d6e432;p=wesnoth-ja%2Ftransifex_scripts.git

masterブランチに変更
---

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}