From e2dfb1e1956ebffb7a8a7079236ccb59e9eecda4 Mon Sep 17 00:00:00 2001
From: Nate Moore <nate@skypack.dev>
Date: Mon, 28 Jun 2021 11:48:20 -0400
Subject: [PATCH] chore: fix tests

---
 .../test/fixtures/astro-collection/src/pages/$shallow.astro    | 2 +-
 .../astro/test/fixtures/astro-collection/src/pages/post/two.md | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/astro/test/fixtures/astro-collection/src/pages/$shallow.astro b/packages/astro/test/fixtures/astro-collection/src/pages/$shallow.astro
index d937b3326..4f13f52eb 100644
--- a/packages/astro/test/fixtures/astro-collection/src/pages/$shallow.astro
+++ b/packages/astro/test/fixtures/astro-collection/src/pages/$shallow.astro
@@ -8,7 +8,7 @@ export async function createCollection() {
       data.sort((a, b) => new Date(b.date) - new Date(a.date));
       return data;
     },
-    pageSize: 4
+    pageSize: 5
   };
 }
 ---
diff --git a/packages/astro/test/fixtures/astro-collection/src/pages/post/two.md b/packages/astro/test/fixtures/astro-collection/src/pages/post/two.md
index f5fc354b0..c1e8a58b8 100644
--- a/packages/astro/test/fixtures/astro-collection/src/pages/post/two.md
+++ b/packages/astro/test/fixtures/astro-collection/src/pages/post/two.md
@@ -1,11 +1,8 @@
 ---
 title: Post Two
 date: 2021-04-14 00:00:00
-<<<<<<< HEAD
 author: author-two
-=======
 draft: true
->>>>>>> dab211b (adds tests for markdown draft / published attributes)
 ---
 
 # Post Two