fixed issues with merging, hopefully
commit
fb092e7eff
|
@ -64,10 +64,14 @@ module.exports = function(eleventyConfig) {
|
||||||
eleventyConfig.addPassthroughCopy("img");
|
eleventyConfig.addPassthroughCopy("img");
|
||||||
eleventyConfig.addPassthroughCopy("css");
|
eleventyConfig.addPassthroughCopy("css");
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
|
||||||
=======
|
=======
|
||||||
eleventyConfig.addPassthroughCopy({ "img/favicon/favicon.ico": "/" });
|
eleventyConfig.addPassthroughCopy({ "img/favicon/favicon.ico": "/" });
|
||||||
>>>>>>> f65ab54f6b56b2b4205dd94542e2ff00c4a5465a
|
>>>>>>> f65ab54f6b56b2b4205dd94542e2ff00c4a5465a
|
||||||
|
=======
|
||||||
|
|
||||||
|
>>>>>>> 9843c4c48624f1f4e4fa78a94f078d49689353d4
|
||||||
|
|
||||||
// Customize Markdown library and settings:
|
// Customize Markdown library and settings:
|
||||||
let markdownLibrary = markdownIt({
|
let markdownLibrary = markdownIt({
|
||||||
|
|
Loading…
Reference in New Issue