From 29e1f9e2bb97cf0bba8c9a8f5a146456553a0a3d Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Thu, 12 Oct 2023 00:27:24 +0200
Subject: [PATCH] Fixed src/unix/assets/86Box.spec.

---
 src/unix/assets/86Box.spec | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/unix/assets/86Box.spec b/src/unix/assets/86Box.spec
index 65f545dc1..d70d31ad9 100644
--- a/src/unix/assets/86Box.spec
+++ b/src/unix/assets/86Box.spec
@@ -121,9 +121,5 @@ popd
 %{_datadir}/%{name}/roms
 
 %changelog
-<<<<<<< HEAD
-* Sat Aug 26 2023 Robert de Rooy <robert.de.rooy[AT]gmail.com> 4.1-1
-=======
-* Thu Oct 12 2023 Robert de Rooy <robert.de.rooy[AT]gmail.com> 4.0.1-1
->>>>>>> origin/master
+* Thu Oct 12 2023 Robert de Rooy <robert.de.rooy[AT]gmail.com> 4.1-1
 - Bump release