merge

2022-03-19 17:44:19 +05:30 · 2022-03-19 17:44:19 +05:30 · 93828490db
parent b18d6849b0
commit 93828490db
1 changed files with 0 additions and 5 deletions
--- a/main.py
+++ b/main.py
@ -1,11 +1,6 @@
 #!/usr/bin/python3
 import os
-<<<<<<< HEAD
 import gui_helper, gui_handler
-=======
-import gui_helper
-import gui_handler
->>>>>>> milan
 from config import Config

 ################################################################################