From 6393082e349c7ee667d63228c501b9a3a074a612 Mon Sep 17 00:00:00 2001 From: VyVu Date: Thu, 2 May 2024 18:19:13 +0700 Subject: [PATCH] init --- src/app/@header/page.tsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/app/@header/page.tsx b/src/app/@header/page.tsx index 68b84bb..5507d01 100644 --- a/src/app/@header/page.tsx +++ b/src/app/@header/page.tsx @@ -37,9 +37,16 @@ export default async function Header() { className='text-sm basis-1/2' /> +<<<<<<< HEAD
avatar
+======= +
+ avatar +
+ +>>>>>>> ff4ec3c (init) ); }