Add zOS build support (google#1088)

onlywork1984 · breadyzhang · commit 39ef0f268453 · 2023-06-02T11:31:49.000-07:00
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
 
