init

vnvyvu · May 7, 2024 · 6393082 · 6393082
1 parent a8a7e33
commit 6393082
Showing 1 changed file with 7 additions and 0 deletions.
diff --git 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'
 				/>
 			</div>
+<<<<<<< HEAD
 			<div className='min-w-32 max-w-32 min-h-32 max-h-32 overflow-clip rounded-md mt-5 ml-auto'>
 				<Image src={avatar} className='-mt-5' alt='avatar' />
 			</div>
 		</header>
+=======
+			<div className='min-w-32 max-w-32 min-h-32 max-h-32 overflow-clip rounded-md mt-5'>
+				<Image src={avatar} className='-mt-5' alt='avatar' />
+			</div>
+		</footer>
+>>>>>>> ff4ec3c (init)
 	);
 }