Merge branch 'openkylin/yangtze' of https://gitee.com/yusq77/kylin-music into openkylin/yangtze

解决pr合并冲突
2022-07-16 19:34:48 +08:00 · 2022-07-16 19:34:48 +08:00 · 712662b1c7
parent e31d08bff0 0c4fd5ef74
commit 712662b1c7
1 changed files with 3 additions and 0 deletions
--- a/translations/kylin-music_bo_CN.ts
+++ b/translations/kylin-music_bo_CN.ts
@ -467,6 +467,7 @@
        <source>kylin-music</source>
        <translation type="unfinished"></translation>
    </message>
+<<<<<<< HEAD
    <message>
        <source>Yes</source>
        <translation type="unfinished"></translation>
@ -475,6 +476,8 @@
        <source>No</source>
        <translation type="unfinished"></translation>
    </message>
+=======
+>>>>>>> 0c4fd5ef741482ae9a56e4128533eddb854641f0
 </context>
 <context>
    <name>TitleBar</name>