update src/cceditor/ccnotepad.ui. 手动解决冲突。

Signed-off-by: 爬山虎 <aaasjm@126.com>
This commit is contained in:
爬山虎 2023-02-08 04:14:39 +00:00 committed by Gitee
parent acab944940
commit 96f3a14311
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 1 additions and 1 deletions

View File

@ -232,7 +232,7 @@
</widget> </widget>
<widget class="QMenu" name="menuCode"> <widget class="QMenu" name="menuCode">
<property name="title"> <property name="title">
<string>E&amp;ncoding</string> <string>Encoding (&amp;N)</string>
</property> </property>
<widget class="QMenu" name="menuASNI"> <widget class="QMenu" name="menuASNI">
<property name="title"> <property name="title">