From 5c78a1583502c109c892e87e8552a15ee6e46b6c Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 3 May 2022 12:56:29 -0700 Subject: [PATCH] Removed dupe lines from merge conflict Signed-off-by: snipe --- app/Console/Commands/MoveUploadsToNewDisk.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app/Console/Commands/MoveUploadsToNewDisk.php b/app/Console/Commands/MoveUploadsToNewDisk.php index 6ebdd0816..798ab9987 100644 --- a/app/Console/Commands/MoveUploadsToNewDisk.php +++ b/app/Console/Commands/MoveUploadsToNewDisk.php @@ -100,15 +100,7 @@ class MoveUploadsToNewDisk extends Command $private_uploads['licenses'] = glob('storage/private_uploads/licenses'."/*.*"); $private_uploads['users'] = glob('storage/private_uploads/users'."/*.*"); $private_uploads['backups'] = glob('storage/private_uploads/backups'."/*.*"); - - $private_uploads['assets'] = glob('storage/private_uploads/assets' . '/*.*'); - $private_uploads['signatures'] = glob('storage/private_uploads/signatures' . '/*.*'); - $private_uploads['audits'] = glob('storage/private_uploads/audits' . '/*.*'); - $private_uploads['assetmodels'] = glob('storage/private_uploads/assetmodels' . '/*.*'); - $private_uploads['imports'] = glob('storage/private_uploads/imports' . '/*.*'); - $private_uploads['licenses'] = glob('storage/private_uploads/licenses' . '/*.*'); - $private_uploads['users'] = glob('storage/private_uploads/users' . '/*.*'); - $private_uploads['backups'] = glob('storage/private_uploads/users' . '/*.*'); + foreach ($private_uploads as $private_type => $private_upload) { {