BodgeMaster
/
Concorde-IDE
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

merge

master
Milan Suman 2022-03-19 17:43:33 +05:30
parent 39a5da7716 b84e21a207
commit b18d6849b0
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main.py
View File

@ -1,6 +1,11 @@
#!/usr/bin/python3 #!/usr/bin/python3
import os import os
<<<<<<< HEAD
import gui_helper, gui_handler import gui_helper, gui_handler
=======
import gui_helper
import gui_handler
>>>>>>> milan
from config import Config from config import Config
################################################################################ ################################################################################