From 0d19e93b3ccb5362158ede2a1db74e7c3869d32f Mon Sep 17 00:00:00 2001
From: TallGorilla <24dasemu@gmail.com>
Date: Thu, 7 Oct 2021 16:09:43 +0200
Subject: [PATCH] Update Jarvis2_4windows.py

---
 Jarvis2_4windows.py | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index b7199ee..6c326ea 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -20,12 +20,8 @@ voices = engine.getProperty("voices")
 engine.setProperty("voice", voices[0].id)
 
 
-<<<<<<< HEAD
 # this funcition checks wich search engine is selected in config file.
 def search_engine_selector():
-=======
-def search_engine_selector():  # this funcition checks which search engine is selected in config file.
->>>>>>> 05cd5b49df1eb083cc6e39fb9b246fd6630aa75f
     if config['DEFAULT']['search_engine'] == 'Google':
         return "https://www.google.com"
     elif config['DEFAULT']['search_engine'] == 'Bing':
@@ -230,7 +226,6 @@ def main():
 
         speak("Next Command! Sir!")
 
-<<<<<<< HEAD
 
 if os.path.isfile('./config.ini'):  # Checks if config.ini exists.
     config = configparser.ConfigParser()  # if exists loads library.
@@ -240,11 +235,3 @@ else:
     # if it doesn't exist it drops an error message and exits.
     print('You need a config.ini file.')
     print('Check the documentation in the Github Repository.')
-=======
-if os.path.isfile('./config.ini'): #Checks if config.ini exists.
-    config = configparser.ConfigParser() #if exists loads library.
-    config.read('config.ini') #and also the file.
-    main() #Then launches the main program
-else:
-    print('You need a config.ini file. Check the documentation in the Github Repository.') #if it doesn't exist it drops an error message and exits.
->>>>>>> 05cd5b49df1eb083cc6e39fb9b246fd6630aa75f