Conflict resolution.

2023-10-12 00:04:46 +02:00
parent 9e905aeacb 8d222c43ac
commit 96e7381099
2 changed files with 5 additions and 1 deletions
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@

  * Bump release.

- -- Jasmine Iwanek <jriwanek@gmail.com>  Sat, 29 Jul 2023 17:32:30 +0200
+ -- Jasmine Iwanek <jriwanek@gmail.com>  Thu, 12 Oct 2023 00:00:31 +0200
--- a/src/unix/assets/86Box.spec
+++ b/src/unix/assets/86Box.spec
@@ -121,5 +121,9 @@ 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
 - Bump release