Merge branch 'master' into development_tri/implementasi_raja_ongkir

# Conflicts:
#	src/lib/checkout/components/Checkout.jsx

1 files changed, 15 insertions, 0 deletions

diff --git a/src/pages/my/daftar-merchant.jsx b/src/pages/my/daftar-merchant.jsx
new file mode 100644
index 00000000..e1fa9bcb
--- /dev/null
+++ b/src/pages/my/daftar-merchant.jsx
@@ -0,0 +1,15 @@
+import Seo from '@/core/components/Seo'
+import BasicLayout from '@/core/components/layouts/BasicLayout'
+import CreateMerchant from '@/lib/form/components/Merchant'
+
+export default function DaftarMerchant() {
+  return (
+    <>
+      <Seo title='Daftar Merchant - Indoteknik.com' />
+
+      <BasicLayout>
+        <CreateMerchant></CreateMerchant>
+      </BasicLayout>
+    </>
+  )
+}