banksampah
/
bank-sampah
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:conflict

main
Kevin Hendrawan 2025-11-19 09:52:35 +07:00
parent c0b73ed4c5
commit 42683c5f91
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Controllers/Main/DataBankSampahController.cs
View File

@ -30,11 +30,7 @@ namespace BankSampahApp.Controllers.Main
status= "<div class=\"badge badge-success badge-soft rounded-full\">Disetujui</div>", status= "<div class=\"badge badge-success badge-soft rounded-full\">Disetujui</div>",
aksi = "<div class=\"flex gap-2\">" + 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>" + "<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/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>" + "<a href=\"#\" class=\"btn btn-circle btn-error text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
"</div>", "</div>",
}, },