From e1fde05ba0356ece70a5f0270e6787a04aa8c7c7 Mon Sep 17 00:00:00 2001 From: althaf Date: Tue, 7 Jul 2026 16:16:53 +0700 Subject: [PATCH] Resolve merge conflict di controller dan routes --- .../Controllers/Web/Produktivitas/SosialEkonomiController.php | 4 ++-- routes/web.php | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Web/Produktivitas/SosialEkonomiController.php b/app/Http/Controllers/Web/Produktivitas/SosialEkonomiController.php index 6834594..6175f29 100644 --- a/app/Http/Controllers/Web/Produktivitas/SosialEkonomiController.php +++ b/app/Http/Controllers/Web/Produktivitas/SosialEkonomiController.php @@ -332,5 +332,5 @@ class SosialEkonomiController extends Controller ->orderBy('nama') ->get(); } - -} + +} \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 87b44f0..fe9fc05 100644 --- a/routes/web.php +++ b/routes/web.php @@ -193,7 +193,6 @@ Route::middleware('auth') Route::resource('petani.lahan-tanaman', App\Http\Controllers\Web\Produktivitas\PetaniLahanController::class); Route::resource('petani.lahan-tanaman.tanaman', App\Http\Controllers\Web\Produktivitas\PetaniLahanTanamanController::class)->only(['show', 'update', 'destroy']); Route::resource('petani.praktik-budidaya', App\Http\Controllers\Web\Produktivitas\PraktikBudidayaController::class); - Route::resource('petani.sosial-ekonomi', App\Http\Controllers\Web\Produktivitas\SosialEkonomiController::class); + Route::resource('petani.sosial-ekonomi', App\Http\Controllers\Web\Produktivitas\SosialEkonomiController::class)->only(['index', 'store', 'update']); Route::resource('petani.akses-pasar', App\Http\Controllers\Web\Produktivitas\AksesPasarController::class); }); -