mirror of
https://github.com/TriM-Organization/Musicreater.git
synced 2025-06-13 23:47:53 +00:00
Merge
This commit is contained in:
parent
0c50ce1134
commit
1f94f558c4
@ -40,10 +40,7 @@ Note! Except for this source file, all the files in this repository and this pro
|
|||||||
|
|
||||||
from msctLib.buildIN import version
|
from msctLib.buildIN import version
|
||||||
from languages.lang import _
|
from languages.lang import _
|
||||||
<<<<<<< HEAD
|
|
||||||
from msctLib.log import log
|
from msctLib.log import log
|
||||||
=======
|
|
||||||
>>>>>>> 9fd32d499fa23eef32bf90e79492ab2be8274239
|
|
||||||
import wx # 引入wxPython库
|
import wx # 引入wxPython库
|
||||||
|
|
||||||
__ver__ = f'{version.version[1]} {version.version[0]}'
|
__ver__ = f'{version.version[1]} {version.version[0]}'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user