80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Conflict resolution.

Browse Source
This commit is contained in:
OBattler
2023-10-12 00:04:46 +02:00
parent 9e905aeacb 8d222c43ac
commit 96e7381099
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@@ -2,4 +2,4 @@
* Bump release. * 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

4
src/unix/assets/86Box.spec
View File

@@ -121,5 +121,9 @@ popd
%{_datadir}/%{name}/roms %{_datadir}/%{name}/roms
%changelog %changelog
<<<<<<< HEAD
* Sat Aug 26 2023 Robert de Rooy <robert.de.rooy[AT]gmail.com> 4.1-1 * 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 - Bump release