fix some code erros

python_modules/conf.py

@@ -1017,7 +1017,7 @@ LBSET_DEVMIN32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 +
                   LBSET_SHARED_INSTALLER_DEV +
                   LBSET_SHARED_INSTALLER_MINI
                   )
-=======
+
 # General Shared commands
 shell_copy_folders = 'cp -r '
 

python_modules/finish_cleanup.py

@@ -22,7 +22,6 @@ BASE_DESTINATION = '/var/www/html/nightly'
 # Set the base ISO Name
 BASE_NAME = 'PeppermintOS'
 
-=======
 import paths
 import time
 
@@ -39,7 +38,6 @@ def make_check_sum():
     os.chdir(HOME_FOLDER + FUSATO_ROOT)
     current_working_directory = os.getcwd().replace('/', '/')
     for _, _, files in os.walk(current_working_directory):
-=======
     current_dir = os.getcwd().replace('/', '/')
     for root, dirs, files in os.walk(current_dir):
         for fiso in files:
@@ -123,7 +121,6 @@ def check_build_type():
 
 
     check_build()
-=======
 def copy_iso_file_nightly_deb32():
     """ Copy the new ISO to the Nightly folder"""
     # Set the home path used regardless the user logged in
@@ -304,7 +301,6 @@ def kill_fusato():
     del_fldr = "fusato"
     del_path = os.path.join(current_dir, del_fldr)
     os.rmdir(del_path)
->>>>>>> cc1e91f1 (Updated)
 
 
 def kill_old_iso():
@@ -328,7 +324,6 @@ def kill_old_iso():
                     if file_time < current_time - day*N:
                         print(f" Delete : {fls}")
                         os.remove(file_location)
-=======
     for p in paths.nightly_paths:
         N = 1
         os.chdir(os.path.join(os.getcwd(), p))
@@ -341,4 +336,3 @@ def kill_old_iso():
             if file_time < current_time - day*N:
                 print(f" Delete : {fls}")
                 os.remove(file_location)
->>>>>>> cc1e91f1 (Updated)

python_modules/inflate_bubble.py

@@ -382,7 +382,6 @@ def set_firmware_arm():
         conf.FIRMWARE_LIST_ARM, mode='x'
         )
 
-=======
 import paths
 import conf