pull main

2025-06-01 12:03:41 +03:30
parent 0c7c7884a4
commit fe548c3a2d
1 changed files with 0 additions and 3 deletions
@@ -1,8 +1,5 @@
 // ... existing imports ...
-<<<<<<< HEAD
 import Navbar from '@/components/layout/navbar';
-=======
->>>>>>> 489e65224a31d72e06ac62b08e200ebb42b171b3

 async function getData() {
  // Simulate a delay to show server-side data fetching