From 12f4a120930b26db3b717e1d43a771931d8b2656 Mon Sep 17 00:00:00 2001 From: pangxie1991 Date: Mon, 1 Jan 2018 16:46:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/release.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/release.sh b/scripts/release.sh index 1d0b2ff5..325f2f5e 100644 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -1,4 +1,5 @@ git checkout master +git merge dev #!/usr/bin/env sh set -e