Resolve merge conflicts

feat/faves
Kamran Ahmed 2 years ago
parent 2ac7b529d1
commit 393dadd943
  1. 2
      src/pages/index.astro

@ -2,7 +2,7 @@
import FeaturedVideos from '../components/FeaturedVideos.astro'; import FeaturedVideos from '../components/FeaturedVideos.astro';
import FeaturedGuides from '../components/FeaturedGuides.astro'; import FeaturedGuides from '../components/FeaturedGuides.astro';
import FeaturedItems from '../components/FeaturedItems/FeaturedItems.astro'; import FeaturedItems from '../components/FeaturedItems/FeaturedItems.astro';
import HeroSection from "../components/HeroSection/HeroSection.astro"; import HeroSection from '../components/HeroSection/HeroSection.astro';
import BaseLayout from '../layouts/BaseLayout.astro'; import BaseLayout from '../layouts/BaseLayout.astro';
import { getAllBestPractices } from '../lib/best-pratice'; import { getAllBestPractices } from '../lib/best-pratice';
import { getAllGuides } from '../lib/guide'; import { getAllGuides } from '../lib/guide';

Loading…
Cancel
Save