<<<<<<< HEAD *.log .DS_Store .env .env.backup .env.production .phpactor.json .phpunit.result.cache /.fleet /.idea /.nova /.phpunit.cache /.vscode /.zed /auth.json /node_modules /public/build /public/hot /public/storage /storage/*.key /storage/pail /vendor Homestead.json Homestead.yaml Thumbs.db ======= /vendor/ node_modules/ npm-debug.log yarn-error.log # Laravel 4 specific bootstrap/compiled.php app/storage/ # Laravel 5 & Lumen specific public/storage public/hot # Laravel 5 & Lumen specific with changed public path public_html/storage public_html/hot storage/*.key .env Homestead.yaml Homestead.json /.vagrant .phpunit.result.cache /public/build /storage/pail .env.backup .env.production .phpactor.json auth.json >>>>>>> 5123647b7180bb2fdc0760039c8e38d903dc15eb