pull main
This commit is contained in:
@@ -1,8 +1,5 @@
|
|||||||
// ... existing imports ...
|
// ... existing imports ...
|
||||||
<<<<<<< HEAD
|
|
||||||
import Navbar from '@/components/layout/navbar';
|
import Navbar from '@/components/layout/navbar';
|
||||||
=======
|
|
||||||
>>>>>>> 489e65224a31d72e06ac62b08e200ebb42b171b3
|
|
||||||
|
|
||||||
async function getData() {
|
async function getData() {
|
||||||
// Simulate a delay to show server-side data fetching
|
// Simulate a delay to show server-side data fetching
|
||||||
|
|||||||
Reference in New Issue
Block a user