| commit | 57f76512bee70f7e96abf9306797a5e256e02453 | [log] [tgz] |
|---|---|---|
| author | William Hesse <whesse@google.com> | Fri Jul 10 17:39:56 2020 +0200 |
| committer | William Hesse <whesse@google.com> | Fri Jul 10 17:39:56 2020 +0200 |
| tree | 604aa3a1c24fe20b0120f2b8bdebde49a3552efc | |
| parent | 187602b7a143dc00f5d57cd0e191ae3a3d209469 [diff] | |
| parent | 5cd263616ca4ba7a1564294b6b2d84a6a0451d8c [diff] |
Version 2.9.0-21.2.beta * Cherry-pick e55aac275ea1e22162fbfd88ed786c9dd4f455f7 to beta
diff --git a/tools/VERSION b/tools/VERSION index 9ffcc23..4cf53fd 100644 --- a/tools/VERSION +++ b/tools/VERSION
@@ -33,14 +33,7 @@ MAJOR 2 MINOR 9 PATCH 0 -<<<<<<< HEAD PRERELEASE 21 -PRERELEASE_PATCH 1 -ABI_VERSION 34 -OLDEST_SUPPORTED_ABI_VERSION 34 -======= -PRERELEASE 21 -PRERELEASE_PATCH 1 +PRERELEASE_PATCH 2 ABI_VERSION 38 OLDEST_SUPPORTED_ABI_VERSION 38 ->>>>>>> 4be56c9f5c8efacc5036e8b5aedf87464657beaa