// Fix themeInstallor error

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15372 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 13:44:26 +00:00
parent 6d51787798
commit 6b9b80a097
1 changed files with 2 additions and 3 deletions
@@ -954,9 +954,8 @@ class ThemeInstallator extends Module
 				if ($row != '.' && $row != '..')
 					$this->archiveThisFile($obj, $row, $server_path.$file.'/', $archive_path.$file.'/');
 		}
-<<<<<<< .mine		else if (!$obj->addFile($server_path.$file, $archive_path.$file))
-=======		elseif (!$obj->addFile($serverPath.$file, $archivePath.$file))
->>>>>>> .theirs			$this->error = true;
+		elseif (!$obj->addFile($server_path.$file, $archive_path.$file))
+			$this->error = true;
 	}

 	/*