diff --git a/Controllers/Main/DataBankSampahController.cs b/Controllers/Main/DataBankSampahController.cs index fecafbc..a2ac5a4 100644 --- a/Controllers/Main/DataBankSampahController.cs +++ b/Controllers/Main/DataBankSampahController.cs @@ -30,7 +30,11 @@ namespace BankSampahApp.Controllers.Main status= "
Disetujui
", aksi = "
" + "" + +<<<<<<< HEAD "" + +======= + "" + +>>>>>>> 0c0e480e52f7c4683b56bfba4f726cffdefadeaf "" + "
", },