Merge pull request #15 from ubvu/add/conflict

Create a conflict
ubvu · Jan 25, 2024 · 726138d · 726138d
2 parents 1e8608f + 46ccb74
commit 726138d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/_quarto.yml b/_quarto.yml
@@ -25,6 +25,8 @@ book:
     - index.qmd
     - part: "Chapters"
       chapters:
+        - chapters/example.qmd
+        - chapters/conflict-chapter.qmd
         - chapters/data-management-plan.qmd
         - chapters/research-drive.qmd
         - chapters/fair-data.qmd

diff --git a/chapters/conflict-chapter.qmd b/chapters/conflict-chapter.qmd