From 5226133ce7b0b1196d9f15215e11c65270f383b6 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Wed, 23 Aug 2023 00:39:52 -0600
Subject: [PATCH] changelog: update previous version.

---
 changelog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/changelog b/changelog
index c0a3392..b2a5305 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 quick-jibri-installer (7.2.1)
 
     * changelog: update previous version.