Fixing conflicts

UofUEpiBio · Nov 26, 2024 · 35e09a1 · 35e09a1
2 parents 2d2303a + 25ad76f
commit 35e09a1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ them.
 | 11/12 and 11/14 | R packages I | [slides](https://UofUEpiBio.github.io/PHS7045-advanced-programming/13-rpkgs-i/slides.html) ([source](https://github.com/UofUEpiBio/PHS7045-advanced-programming//tree/main/13-rpkgs-i/slides.qmd)) | [lab](https://UofUEpiBio.github.io/PHS7045-advanced-programming/13-rpkgs-i/lab.html) ([source](https://github.com/UofUEpiBio/PHS7045-advanced-programming//tree/main/13-rpkgs-i/lab.qmd)) |
 | 11/19 and 11/21 | R packages II |  |  |
 | 11/26 and 11/28 (off) | Automatic Reports with GitHub Actions | [slides](https://UofUEpiBio.github.io/PHS7045-advanced-programming/15-autoreport/slides.html) ([source](https://github.com/UofUEpiBio/PHS7045-advanced-programming//tree/main/15-autoreport/slides.qmd)) |  |
-| 12/03 and 12/05 | Final Prep (Hackathon) |  |  |
+| 12/03 and 12/05 (hybrid) | Final Prep (Hackathon) |  |  |
 | 12/12 | Final |  |  |
 
 ## Assignment workflow

diff --git a/pages.csv b/pages.csv
@@ -14,5 +14,5 @@ date,week,name,id,issue,extra
 11/12 and 11/14,13,R packages I,13-rpkgs-i,,
 11/19 and 11/21,14,R packages II,,,
 11/26 and 11/28 (off),15,Automatic Reports with GitHub Actions,15-autoreport,,
-12/03 and 12/05,16,Final Prep (Hackathon),,,
+12/03 and 12/05 (hybrid),16,Final Prep (Hackathon),,,
 12/12,17,Final,,,