Merge fix

src/pages/blog.astro

@@ -1,18 +1,34 @@
 ---
-import Layout from '../layouts/Layout.astro';
-import BlogCard from '../components/blogCard.astro';
-import BlogSection from '../layouts/blogSection.astro';
+import Layout from '../layouts/Layout.astro'
+import BlogCard from '../components/blogCard.astro'
+import BlogSection from '../layouts/blogSection.astro'
 
-const description = "My own small blog. Topics include FGO, TA, Programming, web technologies and more!"
-const allPosts = await Astro.glob("../pages/blog/*.md");
-allPosts.sort((a, b) => Date.parse(b.frontmatter.pubDate) - Date.parse(a.frontmatter.pubDate));
+const description =
+  'My own small blog. Topics include FGO, TA, Programming, web technologies and more!'
+const allPosts = await Astro.glob('../pages/blog/*.md')
+allPosts.sort(
+  (a, b) =>
+    Date.parse(b.frontmatter.pubDate) - Date.parse(a.frontmatter.pubDate)
+)
 ---
 
-<Layout title="Blog - Firq FGO Site" currentpage="blog" descriptionOverride={description}>
-    <BlogSection title="Blog Articles">
-        {allPosts.map((post) => <BlogCard url={post.url} title={post.frontmatter.title} pubdate={post.frontmatter.pubDate} description={post.frontmatter.description}/>)}
-    </BlogSection>
+<Layout
+  title="Blog - Firq FGO Site"
+  currentpage="blog"
+  descriptionOverride={description}
+>
+  <BlogSection title="Blog Articles">
+    {
+      allPosts.map((post) => (
+        <BlogCard
+          url={post.url}
+          title={post.frontmatter.title}
+          pubdate={post.frontmatter.pubDate}
+          description={post.frontmatter.description}
+        />
+      ))
+    }
+  </BlogSection>
 </Layout>
 
-<style>
-</style>
+<style></style>