Conflict resolution.

This commit is contained in:
OBattler
2023-10-12 00:04:46 +02:00
2 changed files with 5 additions and 1 deletions

2
debian/changelog vendored
View File

@@ -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