From a10e94cd95c392bee97e8d5cb884fbe1b0f77db8 Mon Sep 17 00:00:00 2001
From: Bud Parr <budparr@gmail.com>
Date: Tue, 11 Apr 2017 02:17:47 +0000
Subject: [PATCH] placeholder

---
 404.html |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/404.html b/404.html
index a493242..d20fd99 100755
--- a/404.html
+++ b/404.html
@@ -1,5 +1,6 @@
 {{ define "header" }}{{ partial "page-header.html" . }}{{ end }}
 {{ define "main" }}
+<<<<<<< Updated upstream
 {{ $currentPageUrl := .URL }}
 {{ $currentSection := where .Site.Pages "Section" .Section }}
     <article class="center cf pv5 measure-wide-l">
@@ -7,4 +8,10 @@
         This is not the page you were looking for
       </h1>
     </article>
+=======
+
+404 page hee
+{{ .Content }}
+
+>>>>>>> Stashed changes
 {{ end }}

--
Gitblit v1.10.0