# Conflicts: # app/Http/Controllers/CustomerController.php # app/Http/Controllers/InventoriController.php # app/Http/Controllers/KasirController.php # app/Pembelian.php # resources/views/vendor/adminlte/customer/BeliBarang/createPembelian.blade.php # resources/views/vendor/adminlte/customer/BeliBarang/index.blade.php # resources/views/vendor/adminlte/customer/HistoryPembelian/index.blade.php # resources/views/vendor/adminlte/inventori/ListBarang/create.blade.php # resources/views/vendor/adminlte/inventori/ListBarang/edit.blade.php # resources/views/vendor/adminlte/layouts/partials/sidebar.blade.php # routes/web.php