From cdc17b670cb230447b1899dbe0444d5144157d23 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Wed, 18 May 2022 14:05:02 -0500
Subject: [PATCH] merge fixes

---
 RELEASENOTES.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 2e253e9df..ac8075b72 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,4 +1,6 @@
-- 31384c7d1 (HEAD -> main) updated version to 4.17.13-SNAPSHOT
+- 62dbab35e (HEAD -> main) merge fixes
+- e096e582e fix release
+- 31384c7d1 updated version to 4.17.13-SNAPSHOT
 - 3de6fe953 update release
 - 0e27cf5ba update release action
 - 0f8d698ff checkpoint release