Add zOS build support (google#1088)

breadyzhang · Jun 2, 2023 · 39ef0f2 · 39ef0f2
1 parent f29984c
commit 39ef0f2
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@
 ### Add support for IBM Z operating system z/OS
 * Add build tags for zos
 
+=======
+>>>>>>> 7228dc2 (Add zOS build support (#1088))
 ### Add support for IBM Z operating system z/OS
 * Add build tags for zos