Removed dupe lines from merge conflict

Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2022-05-03 12:56:29 -07:00
parent 150724b744
commit 5c78a15835

View file

@ -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) {
{