Remove merge conflict

akgold · Apr 8, 2024 · 21a6fe4 · 21a6fe4
1 parent bce2a37
commit 21a6fe4
Showing 1 changed file with 0 additions and 23 deletions.
diff --git 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