Remove merge blocks

GeomScale · Feb 26, 2021 · 1bfc766 · 1bfc766
1 parent 37d54dd
commit 1bfc766
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/.github/workflows/R-CMD-check-macOS.yml b/.github/workflows/R-CMD-check-macOS.yml
@@ -20,12 +20,8 @@ jobs:
       fail-fast: false
       matrix:
         config:
-<<<<<<< HEAD
           - {os: macOS-latest,   r: '3.6'}
 #          - {os: macOS-latest,   r: 'devel'} # Error in library(devtools) : there is no package called ‘devtools’
-=======
-          - {os: macOS-latest,   r: 'devel'}
->>>>>>> 6ac32990... Squash commits into one
           - {os: macOS-latest,   r: 'release'}
 
     env:
@@ -51,11 +47,7 @@ jobs:
         run: cd cran_gen/;
              Rscript genCRANpkg.R;
              cd cran_package;
-<<<<<<< HEAD
              Rscript -e "library(rcmdcheck)" -e "rcmdcheck::rcmdcheck(args = c('--no-manual'), error_on = 'warning', check_dir = 'check')"
-=======
-             Rscript -e "library(rcmdcheck)" -e "rcmdcheck::rcmdcheck(args = c('--no-manual', '--as-cran'), error_on = 'warning', check_dir = 'check')"
->>>>>>> 6ac32990... Squash commits into one
 
       - name: Upload check results
         if: failure()