From 29c2f9a48fbe04299a9f20e8790114ae8e7c1f6e Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Tue, 25 Jan 2022 10:30:47 +0000
Subject: [PATCH] Merge the updates to go 1.15 then go 1.16 into a single
 changelog line.

---
 CHANGES.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index a7b0750..a6c1ecb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,8 +17,7 @@ Bugfixes
 Internal Changes
 ----------------
 
-- Update minimum Go version to 1.15. ([\#37](https://github.com/matrix-org/rageshake/issues/37))
-- Update minimum Go version to 1.16. ([\#42](https://github.com/matrix-org/rageshake/issues/42))
+- Update minimum Go version to 1.16. ([\#37](https://github.com/matrix-org/rageshake/issues/37), [\#42](https://github.com/matrix-org/rageshake/issues/42))
 - Add documentation on the types and formats of files submitted to the rageshake server. ([\#44](https://github.com/matrix-org/rageshake/issues/44))
 - Build and push a multi-arch Docker image on the GitHub Container Registry. ([\#47](https://github.com/matrix-org/rageshake/issues/47))
 - Add a /health endpoint that always replies with a 200 OK. ([\#48](https://github.com/matrix-org/rageshake/issues/48))