fixed issues with merging, hopefully

2021-11-17 19:01:06 +00:00 · 2021-11-17 19:01:06 +00:00 · fb092e7eff
parent 4423605fc8 9843c4c486
commit fb092e7eff
1 changed files with 4 additions and 0 deletions
--- a/.eleventy.js
+++ b/.eleventy.js
@ -64,10 +64,14 @@ module.exports = function(eleventyConfig) {
  eleventyConfig.addPassthroughCopy("img");
  eleventyConfig.addPassthroughCopy("css");
 <<<<<<< HEAD
+<<<<<<< HEAD
  
 =======
  eleventyConfig.addPassthroughCopy({ "img/favicon/favicon.ico": "/" });
 >>>>>>> f65ab54f6b56b2b4205dd94542e2ff00c4a5465a
+=======
+  
+>>>>>>> 9843c4c48624f1f4e4fa78a94f078d49689353d4

  // Customize Markdown library and settings:
  let markdownLibrary = markdownIt({