From a36d0aabebfa51e14e6429e40baa9473d832cb3a Mon Sep 17 00:00:00 2001
From: Chef Expeditor <expeditor@chef.io>
Date: Fri, 10 Jul 2020 21:39:15 +0000
Subject: Bump version to 16.2.97 by Chef Expeditor

Obvious fix; these changes are the result of automation not creative thinking.
---
 CHANGELOG.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8345dd53e4..b9a815a925 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 16.2.96 -->
-## [v16.2.96](https://github.com/chef/chef/tree/v16.2.96) (2020-07-09)
+<!-- latest_release 16.2.97 -->
+## [v16.2.97](https://github.com/chef/chef/tree/v16.2.97) (2020-07-10)
 
 #### Merged Pull Requests
-- Fix openssl config tests on Windows [#10138](https://github.com/chef/chef/pull/10138) ([phiggins](https://github.com/phiggins))
+- Fix git sync if the local branch already exist [#9998](https://github.com/chef/chef/pull/9998) ([lotooo](https://github.com/lotooo))
 <!-- latest_release -->
 
 <!-- release_rollup since=16.2.73 -->
 ### Changes not yet released to stable
 
 #### Merged Pull Requests
+- Fix git sync if the local branch already exist [#9998](https://github.com/chef/chef/pull/9998) ([lotooo](https://github.com/lotooo)) <!-- 16.2.97 -->
 - Fix openssl config tests on Windows [#10138](https://github.com/chef/chef/pull/10138) ([phiggins](https://github.com/phiggins)) <!-- 16.2.96 -->
 - Disable Naming/AsciiIdentifiers in our specs [#10139](https://github.com/chef/chef/pull/10139) ([tas50](https://github.com/tas50)) <!-- 16.2.95 -->
 - Support legacy DSS host keys with knife-ssh [#10133](https://github.com/chef/chef/pull/10133) ([tas50](https://github.com/tas50)) <!-- 16.2.94 -->
-- 
cgit v1.2.1