merge

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

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