Commit c9b7ec6f by Juliper

no message

parent 4f0fddb3
......@@ -38,11 +38,7 @@
<a href="{{url('buktipembayaran/'.$a->id)}}">Upload Bukti</a>
</td>
<td>
<<<<<<< HEAD
<a href="{{url('batalkanPemesanan/'.$a->id)}}"> Batalkan Pesanan</a>
=======
<button type="button" class="btn btn-danger" > Cancel </button>
>>>>>>> f3116204933019197d0247bb4b57b8e1a6140fcd
</td>
</tr>
@endforeach
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment