From dd37343bf1800aaf58907ebe8f9b7a1cc08d40ef Mon Sep 17 00:00:00 2001
From: CrimsonTome <4matt2clark7@gmail.com>
Date: Wed, 17 Nov 2021 19:04:26 +0000
Subject: [PATCH] actually fixed?

---
 .eleventy.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.eleventy.js b/.eleventy.js
index ec6c62d..7c6a4a7 100644
--- a/.eleventy.js
+++ b/.eleventy.js
@@ -63,15 +63,6 @@ module.exports = function(eleventyConfig) {
   // Copy the `img` and `css` folders to the output
   eleventyConfig.addPassthroughCopy("img");
   eleventyConfig.addPassthroughCopy("css");
-<<<<<<< HEAD
-<<<<<<< HEAD
-  
-=======
-  eleventyConfig.addPassthroughCopy({ "img/favicon/favicon.ico": "/" });
->>>>>>> f65ab54f6b56b2b4205dd94542e2ff00c4a5465a
-=======
-  
->>>>>>> 9843c4c48624f1f4e4fa78a94f078d49689353d4
 
   // Customize Markdown library and settings:
   let markdownLibrary = markdownIt({