From 01cf8760989845bdac04b2c857b5eb9c1867d360 Mon Sep 17 00:00:00 2001
From: Sam Toohey <hello@samtoohey.xyz>
Date: Wed, 26 Jun 2024 14:22:55 +1000
Subject: [PATCH] Update 404.html

Using the GH CLI I think I have resolved the conflicts here.
---
 poetry/templates/404.html | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/poetry/templates/404.html b/poetry/templates/404.html
index 41b968ce..a8645eea 100644
--- a/poetry/templates/404.html
+++ b/poetry/templates/404.html
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <!-- wp:group {"style":{"spacing":{"padding":{"top":"32px","bottom":"32px"}}},"layout":{"type":"constrained"}} -->
     <div class="wp-block-group" style="padding-top:32px;padding-bottom:32px">
         <!-- wp:group {"style":{"spacing":{"blockGap":"64px"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
@@ -28,18 +27,3 @@ <h5 class="wp-block-heading">It looks like nothing was found at this location. T
         <!-- wp:search {"label":"Search...","buttonText":"Search","buttonUseIcon":true} /-->
     </div>
     <!-- /wp:group -->
-=======
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|80","bottom":"var:preset|spacing|80"},"margin":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="margin-top:var(--wp--preset--spacing--50);margin-bottom:var(--wp--preset--spacing--50);padding-top:var(--wp--preset--spacing--80);padding-bottom:var(--wp--preset--spacing--80)"><!-- wp:heading {"textAlign":"center"} -->
-<h2 class="wp-block-heading has-text-align-center">404<br>Not found</h2>
-<!-- /wp:heading -->
-
-<!-- wp:paragraph {"align":"center"} -->
-<p class="has-text-align-center">The server could not find the requested page.</p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
->>>>>>> dfce47d (Creates template files for Poetrye's search and 404 pages (#141))