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

[Jonathan Riddell]

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

merge

M  +0    -12   debian/changelog

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

diff --git a/debian/changelog b/debian/changelog
index 483042c..6e9d7e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,3 @@
-<<<<<<< HEAD
-libaqbanking (6.2.9-0neon) focal; urgency=medium
-
-  [ Micha Lenk ]
-  * New upstream version 6.0.2
-  * debian/salsa-ci.yml: No longer set RELEASE to 'experimental'.
-
-  [ Jonathan Riddell ]
-  * New release
-
- -- Jonathan Riddell <jr at jriddell.org>  Wed, 17 Feb 2021 13:05:36 +0000
-=======
 libaqbanking (6.2.10-1) unstable; urgency=medium
 
   * New upstream version 6.2.10.