Skip to content

Commit

Permalink
docs(changelog): remove the incorrect merge conflict line (#14060)
Browse files Browse the repository at this point in the history
  • Loading branch information
AndyZhang0707 authored Dec 31, 2024
1 parent 938747a commit 4c1bd2e
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@ database contains invalid Wasm filters.
[#289](https://github.com/Kong/kong-manager/issues/289)


>>>>>>> 4fb6d639ab (docs(changelog): update 3.9.0 changelog (#14016))
## 3.8.1

## Kong
Expand Down

1 comment on commit 4c1bd2e

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bazel Build

Docker image available kong/kong:4c1bd2e9101d4cb635164cea6caf30fa89326f63
Artifacts available https://github.com/Kong/kong/actions/runs/12555066643

Please sign in to comment.