oops

haroohie-club · Jul 23, 2024 · d89ed98 · d89ed98
1 parent e289fe8
commit d89ed98
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/SerialLoops/Strings.zh-Hans.resx b/src/SerialLoops/Strings.zh-Hans.resx
@@ -201,11 +201,7 @@
     <value>“访问保存数据提示”消息框</value>
   </data>
   <data name="(Missing)" xml:space="preserve">
-<<<<<<< HEAD
     <value> （缺失）</value>
-=======
-    <value>（缺失）</value>
->>>>>>> weblate/main
   </data>
   <data name="Batch Dialogue Display On" xml:space="preserve">
     <value>批量对话显示开</value>