commit 1f8ce8b566f7804992a8f310e168174b060fe3c7
author William Hesse <whesse@google.com> Tue Jun 21 10:26:58 2022 +0200
committer William Hesse <whesse@google.com> Tue Jun 21 11:01:26 2022 +0200
tree 31d4caacae774ddf6686174bb1bdac888765d6cf
parent c6b0453443b6908fc6ce4e30d2eceb47628d717e

[release] Add changelog for 2.17.5

Because of a problem releasing 2.17.4, a new stable release 2.17.5
is being created with no additional changes. Since 2.17.4 will not
be published, the changelog entry is changed to refer to 2.17.5.

Change-Id: Ibf4c83268790ccca54eb375a3a958dd56ce538d1

CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0699684..c146e53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,4 @@
-<<<<<<< HEAD
-## 2.17.4 - 2022-06-20
+## 2.17.5 - 2022-06-22
 
 This is a patch release that fixes: