diff options
author | David Pursehouse <dpursehouse@collab.net> | 2019-03-13 17:04:24 +0900 |
---|---|---|
committer | David Pursehouse <dpursehouse@collab.net> | 2019-03-13 17:06:45 +0900 |
commit | 68925785119f47d9695df4231c5cc82dc440abb4 (patch) | |
tree | 2d648e043f4abe875b2db7cf72979816a0a7d478 /tools | |
parent | a4b8fa769a072b005fba07520215a3565b1a07ec (diff) | |
parent | 3efa1058b214469c3c612cd38909d453aa7e8af9 (diff) |
Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Upgrade google-java-format to 1.7
Change-Id: I08bad33a69e8425b699608a06b71ed767f061afd
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/setup_gjf.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/setup_gjf.sh b/tools/setup_gjf.sh index c450811f62..119f9af3d7 100755 --- a/tools/setup_gjf.sh +++ b/tools/setup_gjf.sh @@ -17,7 +17,7 @@ set -eu # Keep this version in sync with dev-contributing.txt. -VERSION=${1:-1.6} +VERSION=${1:-1.7} case "$VERSION" in 1.3) |