resolve conflic

This commit is contained in:
Usman Nasir
2022-06-07 13:50:32 +05:00
parent e67f49cd05
commit c1e17b84e1

View File

@@ -2246,7 +2246,7 @@ $parameters = array(
command = f'rm -rf {self.tempPath}' command = f'rm -rf {self.tempPath}'
#ProcessUtilities.executioner(command) ProcessUtilities.executioner(command)
logging.statusWriter(self.tempStatusPath, 'Completed.[200]') logging.statusWriter(self.tempStatusPath, 'Completed.[200]')
@@ -2258,7 +2258,6 @@ $parameters = array(
mesg = '%s. [404]' % (str(msg)) mesg = '%s. [404]' % (str(msg))
logging.statusWriter(self.tempStatusPath, mesg) logging.statusWriter(self.tempStatusPath, mesg)
def WPCreateBackup(self): def WPCreateBackup(self):
try: try:
from managePHP.phpManager import PHPManager from managePHP.phpManager import PHPManager