placeholder

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 }}

layouts/404.html

@@ -1,6 +1,10 @@
+{{ define "header" }}{{ partial "page-header.html" . }}{{ end }}
 {{ define "main" }}
-<main class="cf pa5 pa4-l f4 tc center measure-wide lh-copy gray">
+{{ $currentPageUrl := .URL }}
-  <h1>Page not found</h1>
+{{ $currentSection := where .Site.Pages "Section" .Section }}
-  {{ .Content }}
+    <article class="center cf pv5 measure-wide-l">
-</main>
+      <h1>
+        This is not the page you were looking for
+      </h1>
+    </article>
 {{ end }}

src/webpack.config.js

@@ -2,7 +2,6 @@ var path = require("path");
 var ExtractTextPlugin = require("extract-text-webpack-plugin");
 var webpack = require("webpack");
 module.exports = {
-	// context: path.resolve(__dirname, './src'),
 	entry: {
 		app: './js/main.js'
 	},
@@ -14,13 +13,6 @@ module.exports = {
 					fallback: "style-loader",
 					use: 'css-loader?importLoaders=1!postcss-loader'
 				})
-			},
-			{
-				test: /\.(jpe?g|png|gif|svg)$/i,
-				use: [
-					'url-loader?limit=10000',
-					'img-loader'
-				]
 			}
 		]
 	},

theme.toml

@@ -1,14 +1,14 @@
 # theme.toml template for a Hugo theme
 # See https://github.com/spf13/hugoThemes#themetoml for an example
 
-name = "Gohugo Default"
+name = "Gohugo Default Theme"
 license = "MIT"
-licenselink = "https://github.com/yourname/yourtheme/blob/master/LICENSE.md"
+licenselink = "https://github.com/budparr/gohugo-default-theme/blob/master/LICENSE.md"
 description = ""
-homepage = "http://siteforthistheme.com/"
+homepage = "https://github.com/budparr/gohugo-default-theme"
 tags = ["website", "starter"]
 features = ["", ""]
-min_version = 0.18
+min_version = 0.19
 
 [author]
   name = "Bud Parr"