From 93828490db51f22d11019b44f7c9a7b512b98ce2 Mon Sep 17 00:00:00 2001
From: Milan Suman <milansuman2016@gmail.com>
Date: Sat, 19 Mar 2022 17:44:19 +0530
Subject: [PATCH] merge

---
 main.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/main.py b/main.py
index f75cf12..0d7ba07 100644
--- 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
 
 ################################################################################