From 78cd79ec480c5e4643b792ed9fcb8dd36fb882cd Mon Sep 17 00:00:00 2001
From: Kayou <pierre@kayou.io>
Date: Mon, 5 Jun 2023 10:11:50 +0200
Subject: [PATCH] Update debian/changelog

---
 debian/changelog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 69418598c..bc06c7e42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,6 @@ yunohost (11.1.20) stable; urgency=low
   Thanks to all contributors <3 ! (axolotle, Éric Gaspar, Ilya, Jose Riha, Neko Nekowazarashi, Yann Autissier)
 
  -- Alexandre Aubin <alex.aubin@mailoo.org>  Sat, 20 May 2023 18:57:26 +0200
->>>>>>> origin/dev
 
 yunohost (11.1.19) stable; urgency=low