From 71c8d17c78572cb346a461cb12359339811c528f Mon Sep 17 00:00:00 2001
From: Michael Derynck <michael.derynck@grafana.com>
Date: Tue, 1 Nov 2022 18:29:28 -0600
Subject: [PATCH] Changelog cleanup

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2092d0a6..6dbcecb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,7 +42,6 @@
 
 - Add personal email notifications
 - Bug fixes
->>>>>>> dev
 
 ## v1.0.40 (2022-10-05)