update links and dates

lisallreiber · Sep 23, 2023 · 0cf8c7b · 0cf8c7b
1 parent ccd2706
commit 0cf8c7b
Show file tree

Hide file tree

Showing 9 changed files with 779 additions and 110 deletions.
diff --git a/docs/README.html b/docs/README.html
diff --git a/docs/README.md b/docs/README.md
diff --git a/docs/day1_1.md b/docs/day1_1.md
@@ -5,4 +5,4 @@ here you will find slides and materials during the workshop
 
 **Slides**
 
-You can right-click and save [this link](https://github.com/lisallreiber/R-Workshop/raw/master/assets/slides/01_Intro-RStudio.pdf), which will download the slides as PDF or follow the link and view the slides on GitHub.
+You can right-click and save [this link](https://github.com/lisallreiber/R-Workshop/raw/main/assets/slides/01_Intro-RStudio.pdf), which will download the slides as PDF or follow the link and view the slides on GitHub.
diff --git a/docs/day1_2.md b/docs/day1_2.md
@@ -5,12 +5,12 @@ here you will find slides and materials of the workshop
 
 **Slides**
 
-You can right-click and save [this link](https://github.com/lisallreiber/R-Workshop/raw/master/assets/slides/02_RMarkdown-Basics.pdf), which will download the slides as PDF or follow the link and view the slides on GitHub.
+You can right-click and save [this link](https://github.com/lisallreiber/R-Workshop/raw/main/assets/slides/02_RMarkdown-Basics.pdf), which will download the slides as PDF or follow the link and view the slides on GitHub.
 
 
 **Instructions**
 
-Here you can find the [02 R Markdown-Basics Hands-on instructions](https://github.com/lisallreiber/R-Workshop/blob/master/02_RMarkdown-Basics/02_Instructions.md)  
+Here you can find the [02 R Markdown-Basics Hands-on instructions](https://github.com/lisallreiber/R-Workshop/blob/main/02_RMarkdown-Basics/02_Instructions.md)  
 
 
 
diff --git a/docs/day1_3.md b/docs/day1_3.md
@@ -4,9 +4,9 @@ here you will find slides and materials of the workshop
 
 **Slides**
 
-You can right-click and save [this link](https://github.com/lisallreiber/R-Workshop/raw/master/assets/slides/03_Meta-Viz.pdf), which will download the slides as PDF or follow the link and view the slides on GitHub.
+You can right-click and save [this link](https://github.com/lisallreiber/R-Workshop/raw/main/assets/slides/03_Meta-Viz.pdf), which will download the slides as PDF or follow the link and view the slides on GitHub.
 
 
 **Instructions**
 
-Here you can find the [03 Meta-Viz: Coding in R Markdown Hands-on instructions](https://github.com/lisallreiber/R-Workshop/blob/master/03_MetaViz/03_instructions.html)  
+Here you can find the [03 Meta-Viz: Coding in R Markdown Hands-on instructions](https://github.com/lisallreiber/R-Workshop/blob/main/03_MetaViz/03_instructions.html)  
diff --git a/docs/day1_4.md b/docs/day1_4.md
@@ -4,9 +4,9 @@ here you will find slides and materials of the workshop
 
 **Slides**
 
-You can right-click and save [this link](https://github.com/lisallreiber/R-Workshop/raw/master/assets/slides/04_RMarkdown-Websites.pdf), which will download the slides as PDF or follow the link and view the slides on GitHub.
+You can right-click and save [this link](https://github.com/lisallreiber/R-Workshop/raw/main/assets/slides/04_RMarkdown-Websites.pdf), which will download the slides as PDF or follow the link and view the slides on GitHub.
 
 
 **Instructions**
 
-Here you can find the [02 R Markdown Website Features instructions](https://github.com/lisallreiber/R-Workshop/blob/master/04_RMarkdown-Webstack/04_instructions.html)  
+Here you can find the [02 R Markdown Website Features instructions](https://github.com/lisallreiber/R-Workshop/blob/main/04_RMarkdown-Webstack/04_instructions.html)  
diff --git a/docs/day2_1.md b/docs/day2_1.md
@@ -4,9 +4,9 @@ here you will find slides and materials during the workshop
 
 **Slides**
 
-You can right-click and save [this link](https://github.com/lisallreiber/R-Workshop/raw/master/assets/slides/05_GithubPages.pdf), which will download the slides as PDF or follow the link and view the slides on GitHub.
+You can right-click and save [this link](https://github.com/lisallreiber/R-Workshop/raw/main/assets/slides/05_GithubPages.pdf), which will download the slides as PDF or follow the link and view the slides on GitHub.
 
 
 **Instructions**
 
-Here you can find the [05 Git & GitHub](https://github.com/lisallreiber/R-Workshop/blob/master/05_github/05_instructions.html)  
+Here you can find the [05 Git & GitHub](https://github.com/lisallreiber/R-Workshop/blob/main/05_github/05_instructions.html)  
diff --git a/docs/day2_2.md b/docs/day2_2.md
@@ -3,6 +3,6 @@
 here you will find slides and materials during the workshop
 
 **Slides**
-You can right-click and save [this link](https://github.com/lisallreiber/R-Workshop/raw/master/assets/slides/05_GithubPages.pdf), which will download the slides as PDF or follow the link and view the slides on GitHub.
+You can right-click and save [this link](https://github.com/lisallreiber/R-Workshop/raw/main/assets/slides/05_GithubPages.pdf), which will download the slides as PDF or follow the link and view the slides on GitHub.
 
 
diff --git a/other/preparation.R b/other/preparation.R
@@ -19,11 +19,7 @@ blog_badge <- badgr::get_badge(
 
 
 # Set underlying badge link (where the badge-click will take you)
-<<<<<<< HEAD
-link <- "https://github.com/lisallreiber/R-Workshop/raw/master/assets/slides/00_R-Workshop.pdf"
-=======
-link <- "https://gather.town/app/RL6StuU0Rtlvtqp9/R-workshop"
->>>>>>> 099c6ec0e5e5152e0a966f304a757fa5f7ce65af
+link <- "https://github.com/lisallreiber/R-Workshop/raw/main/assets/slides/00_R-Workshop.pdf"
 
 slides_badge <- badgr::get_badge(
       label = "workshop slides",   # left-side text