resolve merge conflict

Merge branch 'main' into development # Conflicts: # DESCRIPTION
jhorzek · Nov 19, 2023 · f6fdf49 · f6fdf49
2 parents 8b7e9eb + 5d1c9e0
commit f6fdf49
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.Rmd b/README.Rmd
@@ -100,7 +100,7 @@ branch will match the version currently available from CRAN. The **development**
 will have newer features not yet available from CRAN. This branch will have passed all
 current tests of our test suite, but may not be ready for CRAN yet (e.g., because
 not all objectives of the road map have been met). **gh-pages** is used to create 
-the [documentation website](jhorzek.github.io/lessSEM/). Finally, all other branches
+the [documentation website](https://jhorzek.github.io/lessSEM/). Finally, all other branches
 are used for ongoing development and should be considered unstable.
 
 # Introduction

diff --git a/README.md b/README.md
@@ -94,7 +94,7 @@ devtools::install_github("jhorzek/lessSEM",
 > CRAN. This branch will have passed all current tests of our test
 > suite, but may not be ready for CRAN yet (e.g., because not all
 > objectives of the road map have been met). **gh-pages** is used to
-> create the [documentation website](jhorzek.github.io/lessSEM/).
+> create the [documentation website](https://jhorzek.github.io/lessSEM/).
 > Finally, all other branches are used for ongoing development and
 > should be considered unstable.