# Conflicts:
#	app/Http/Controllers/DashboardController.php
#	app/Http/Controllers/FrontendController.php
#	app/Http/Controllers/PaymentController.php
#	app/Http/Controllers/RekapWController.php
#	app/Models/Detail_transaksi.php
#	resources/views/FrontEnd/welcome.blade.php
#	resources/views/admin/layouts2/master.blade.php
#	resources/views/admin/tempat/create.blade.php
#	routes/web.php
#	vendor/composer/autoload_classmap.php
#	vendor/composer/autoload_static.php

# Conflicts:
#	app/Http/Controllers/DashboardController.php
#	app/Http/Controllers/FrontendController.php
#	app/Http/Controllers/PaymentController.php
#	app/Http/Controllers/TiketController.php
#	config/app.php
#	public/vendor/onix_template/index.html
#	resources/views/FrontEnd/master.blade.php
#	resources/views/FrontEnd/showtempatk.blade.php
#	resources/views/FrontEnd/showtempatp.blade.php
#	resources/views/FrontEnd/welcome.blade.php
#	resources/views/admin/layouts2/master.blade.php
#	resources/views/admin/tempat/create.blade.php
#	resources/views/bayar.blade.php
#	resources/views/bayar_proses.blade.php
#	resources/views/bayar_update.blade.php
#	resources/views/pesanan/detailpesanan.blade.php
#	resources/views/pesanan/semuapesanan.blade.php
#	resources/views/pesananku.blade.php
#	resources/views/profile.blade.php
#	resources/views/wisata/rekap.blade.php
#	routes/web.php
#	vendor/composer/autoload_classmap.php
#	vendor/composer/autoload_static.php

# Conflicts:
#	app/Models/Detail_transaksi.php
#	routes/api.php
#	routes/web.php

# Conflicts:
#	app/Models/User.php
#	resources/views/FrontEnd/welcome.blade.php
#	resources/views/admin/pelanggan/index.blade.php
#	resources/views/admin/tempat/index.blade.php
#	resources/views/wisata/rekap.blade.php