actually fixed?

2021-11-17 19:04:26 +00:00 · 2021-11-17 19:04:26 +00:00 · dd37343bf1
parent fb092e7eff
commit dd37343bf1
1 changed files with 0 additions and 9 deletions
--- 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({