From 4bdd2e48817814e675662c0839a9183d52b8a733 Mon Sep 17 00:00:00 2001
From: Flavio Castelli <flavio@castelli.me>
Date: Thu, 1 Jun 2023 10:29:14 +0200
Subject: [PATCH] Add support for WASI port (#1089)

Fix building when the new `wasip1` port is being used.
This is a new target that will be introduced by go 1.21.

For more details https://github.com/golang/go/issues/58141

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
---
 CHANGELOG.md | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f11ca8a1dc7..3597172b59c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,21 +8,6 @@
 ### Add support for IBM Z operating system z/OS
 * Add build tags for zos
 
-=======
->>>>>>> 7228dc2 (Add zOS build support (#1088))
-=======
-=======
-### Fix flaky submission failures
-* #1084: CT flaky submission failures
-
->>>>>>> 28b77d1 (update changelog)
-### Add support for WASI port
-* Add build tags for wasip1 GOOS
-
->>>>>>> 37ba9ac (Add support for WASI port (#1089))
-### Add support for IBM Z operating system z/OS
-* Add build tags for zos
-
 ### Chrome CT Policy Update
  * #906: Update chromepolicy.go to follow the updated Chrome CT policy.