[neon/backports-focal/libaqbanking/Neon/release] debian: merge

[Jonathan Riddell]

Git commit a7c916347e548905f07c61ae6d4be26a8beb9537 by Jonathan Riddell.
Committed on 24/03/2021 at 09:52.
Pushed by jriddell into branch 'Neon/release'.

merge

M  +0    -1    debian/changelog

https://invent.kde.org/neon/backports-focal/libaqbanking/commit/a7c916347e548905f07c61ae6d4be26a8beb9537

diff --git a/debian/changelog b/debian/changelog
index 6e9d7e0..9916705 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -79,7 +79,6 @@ libaqbanking (6.1.3-1) unstable; urgency=medium
     a way yet to use it in debian/watch.
 
  -- Micha Lenk <micha at debian.org>  Sat, 21 Mar 2020 22:38:37 +0100
->>>>>>> salsa/master
 
 libaqbanking (6.0.1-2) unstable; urgency=medium