From d18277f17fa252d79d1a99e34ff5ac5d0a2f69da Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 19 Oct 2021 19:50:44 +0200 Subject: [PATCH] Bad conflict fix --- debian/changelog | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 79990c98..e996c31f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -74,7 +74,6 @@ yunohost-admin (4.3.0) testing; urgency=low Thanks to all contributors <3 ! (axolotle, Christian Wehrli, Daniel, Éric Gaspar, JocelynDelalande, José M, liimee, ljf, Parviz Homayun, possy eater, ppr, saptrishi das biswas, Tymofii-Lytvynenko) -- Alexandre Aubin Sun, 19 Sep 2021 23:49:02 +0200 ->>>>>>> dev yunohost-admin (4.2.5) stable; urgency=low