mirror of https://gitee.com/cxasm/notepad--.git
update src/cceditor/ccnotepad.ui. 手动解决冲突。
Signed-off-by: 爬山虎 <aaasjm@126.com>
This commit is contained in:
parent
acab944940
commit
96f3a14311
|
@ -232,7 +232,7 @@
|
|||
</widget>
|
||||
<widget class="QMenu" name="menuCode">
|
||||
<property name="title">
|
||||
<string>E&ncoding</string>
|
||||
<string>Encoding (&N)</string>
|
||||
</property>
|
||||
<widget class="QMenu" name="menuASNI">
|
||||
<property name="title">
|
||||
|
|
Loading…
Reference in New Issue