commit 187602b7a143dc00f5d57cd0e191ae3a3d209469
author William Hesse <whesse@google.com> Fri Jul 10 10:02:57 2020 +0200
committer William Hesse <whesse@google.com> Fri Jul 10 10:02:57 2020 +0200
tree 8291e1d11c53c63bce522d2d57f05ada06fa003a
parent 5815449a2935fd4a0a9505fa0f7ca562a53f2465
parent 4be56c9f5c8efacc5036e8b5aedf87464657beaa

Version 2.9.0-21.1.beta

Merge commit '4be56c9f5c8efacc5036e8b5aedf87464657beaa' into beta

tools/VERSION

diff --git a/tools/VERSION b/tools/VERSION
index b8eb434..9ffcc23 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -29,11 +29,18 @@
 #  * Deprecating an old ABI version:
 #     - increase OLDEST_SUPPORTED_ABI_VERSION to the version that is supported.
 #
-CHANNEL dev
+CHANNEL beta
 MAJOR 2
 MINOR 9
 PATCH 0
+<<<<<<< HEAD
 PRERELEASE 21
-PRERELEASE_PATCH 0
+PRERELEASE_PATCH 1
+ABI_VERSION 34
+OLDEST_SUPPORTED_ABI_VERSION 34
+=======
+PRERELEASE 21
+PRERELEASE_PATCH 1
 ABI_VERSION 38
 OLDEST_SUPPORTED_ABI_VERSION 38
+>>>>>>> 4be56c9f5c8efacc5036e8b5aedf87464657beaa