Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
pa2d4ti06
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Juliper
pa2d4ti06
Commits
c9b7ec6f
Commit
c9b7ec6f
authored
7 years ago
by
Juliper
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
4f0fddb3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
4 deletions
+0
-4
History.blade.php
...views/vendor/adminlte/layouts/customers/History.blade.php
+0
-4
No files found.
resources/views/vendor/adminlte/layouts/customers/History.blade.php
View file @
c9b7ec6f
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment