merge:同步代码解决冲突

2023-09-28 14:08:21 +08:00 · 2023-09-28 14:08:21 +08:00 · 71741d538b
parent 58f5d4d27a 586c1ffec2
commit 71741d538b
1 changed files with 10 additions and 0 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,13 @@
+kylin-nm (3.24.0.0-0k2.21) v101; urgency=medium
+
+  * BUG:
+      - #194718 【网络连接】麒麟网络设置工具可固定到任务栏
+  * 需求号：无
+  * 其他改动说明: 弹窗跳过任务栏
+  * 其他改动影响域：单例 
+
+ -- zhaoshixu <zhaoshixu@kylinos.cn>  Thu, 28 Sep 2023 09:41:09 +0800
+
 kylin-nm (3.24.0.0-0k2.20) v101; urgency=medium

  * BUG: