From 21a6fe4839296e341c4ec471d74f2aba44a1c19e Mon Sep 17 00:00:00 2001
From: Alex K Gold <alexkgold@gmail.com>
Date: Mon, 8 Apr 2024 13:24:22 -0400
Subject: [PATCH] Remove merge conflict

---
 _quarto.yml | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/_quarto.yml b/_quarto.yml
index 476abe5b..130805ca 100644
--- a/_quarto.yml
+++ b/_quarto.yml
@@ -63,32 +63,9 @@ output: asis
 
 
 format:
-<<<<<<< HEAD
-  html:
-    theme: flatly
-
-  # docx:
-  #   toc: true
-  #   standalone: true
-  # pdf:
-  #   keep-tex: true
-  #   fig-pos: H
-  #   documentclass: krantz
-  #    include-in-header:
-  #    text: |
-  #      \usepackage{makeidx}
-  #      \makeindex
-  #    include-after-body:
-  #      text: |
-  #        \printindex
-
-filters:
-   - include-code-files
-=======
    html:
      theme: flatly
      cover-image: cover.jpg
->>>>>>> d82339b0485ec5fb0f702739de72c605c5cff527
 
 editor: visual