From 42683c5f91019885ee3da64e52281b72195be8c6 Mon Sep 17 00:00:00 2001
From: Kevin Hendrawan <projectkevin97@gmail.com>
Date: Wed, 19 Nov 2025 09:52:35 +0700
Subject: [PATCH] fix:conflict

---
 Controllers/Main/DataBankSampahController.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Controllers/Main/DataBankSampahController.cs b/Controllers/Main/DataBankSampahController.cs
index a2ac5a4..fecafbc 100644
--- a/Controllers/Main/DataBankSampahController.cs
+++ b/Controllers/Main/DataBankSampahController.cs
@@ -30,11 +30,7 @@ namespace BankSampahApp.Controllers.Main
                     status= "<div class=\"badge badge-success badge-soft rounded-full\">Disetujui</div>",
                     aksi = "<div class=\"flex gap-2\">" +
                     "<a href=\"javascript:void(0)\" class=\"btn btn-circle btn-success text-white btn-sm\"><i class=\"ph ph-check\"></i></a>" +
-<<<<<<< HEAD
                     "<a href=\"/Main/DataBankSampah/Detail\" class=\"btn btn-circle btn-info text-white btn-sm\"><i class=\"ph ph-eye\"></i></a>" +
-=======
-                    "<a href=\"/Main/Profil/Index\" class=\"btn btn-circle btn-info text-white btn-sm\"><i class=\"ph ph-eye\"></i></a>" +
->>>>>>> 0c0e480e52f7c4683b56bfba4f726cffdefadeaf
                     "<a href=\"#\" class=\"btn btn-circle btn-error text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
                     "</div>",
                 },