[neon/kde/kiconthemes/Neon/release_focal] debian: merge

[Jonathan Esk-Riddell]

Git commit 069cf514373cf1f3989a6798e18d301029f9dae2 by Jonathan Esk-Riddell.
Committed on 19/08/2022 at 15:45.
Pushed by jriddell into branch 'Neon/release_focal'.

merge

M  +7    -0    debian/changelog

https://invent.kde.org/neon/kde/kiconthemes/commit/069cf514373cf1f3989a6798e18d301029f9dae2

diff --cc debian/changelog
index 2437c49,75643a4..f30a820
--- a/debian/changelog
+++ b/debian/changelog
@@@ -4,10 -4,10 +4,17 @@@ kiconthemes (5.97.0-0neon) focal; urgen
  
   -- Neon CI <neon at kde.org>  Mon, 15 Aug 2022 13:31:08 +0000
  
 +kiconthemes (5.96.0-0neon) focal; urgency=medium
 +
 +  * New release
 +
++ -- Neon CI <neon at kde.org>  Mon, 15 Aug 2022 13:31:08 +0000
++
+ kiconthemes (5.97.0-0neon) focal; urgency=medium
+ 
+   * New release
+ 
++>>>>>>> origin/Neon/unstable
   -- Neon CI <neon at kde.org>  Mon, 11 Jul 2022 09:02:39 +0000
  
  kiconthemes (5.95.0-0neon) focal; urgency=medium