diff options
| author | Miqdad <ahmadmiqdad27@gmail.com> | 2025-05-31 21:39:53 +0700 |
|---|---|---|
| committer | Miqdad <ahmadmiqdad27@gmail.com> | 2025-05-31 21:39:53 +0700 |
| commit | 77f976d3bd09d9e00d4d55bbd40579b439405d96 (patch) | |
| tree | a8959bba3d8a51570c439789f92653409a0065ae /src/pages/daftar-merchant.jsx | |
| parent | ca05a70e98e9066882de6394ffbd89db7af2cb9d (diff) | |
| parent | 2a1dea70b8f0062fe8eebeb7139a7b77a24e220b (diff) | |
Merge branch 'new-release' of https://bitbucket.org/altafixco/next-indoteknik into biteship-merge
# Conflicts:
# src/lib/checkout/components/Checkout.jsx
# src/lib/transaction/components/Transaction.jsx
Diffstat (limited to 'src/pages/daftar-merchant.jsx')
| -rw-r--r-- | src/pages/daftar-merchant.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pages/daftar-merchant.jsx b/src/pages/daftar-merchant.jsx index e1fa9bcb..945a0060 100644 --- a/src/pages/daftar-merchant.jsx +++ b/src/pages/daftar-merchant.jsx @@ -12,4 +12,4 @@ export default function DaftarMerchant() { </BasicLayout> </> ) -} +}
\ No newline at end of file |