resolve merge conflict

Merge branch 'master' into dev

# Conflicts:
#	.github/workflows/R-CMD-check-dev.yaml

Author: kkulma-mars

.github/workflows/R-CMD-check-dev.yaml

@@ -12,6 +12,7 @@ name: R-CMD-check-dev
 
 jobs:
   R-CMD-check-dev:
+
     runs-on: ${{ matrix.config.os }}
 
     name: ${{ matrix.config.os }} (${{ matrix.config.r }})