merge
parent
b18d6849b0
commit
93828490db
5
main.py
5
main.py
|
@ -1,11 +1,6 @@
|
||||||
#!/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
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
Reference in New Issue