Fixing merge conflict with netcdf linux install

Merge branch 'version_1.3.2' of https://github.com/wkumler/RaMS into version_1.3.2 # Conflicts: # .github/workflows/r-check-cran.yml
wkumler · Nov 30, 2023 · 42361fd · 42361fd
2 parents 4dcac47 + 8adbe5a
commit 42361fd
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.github/workflows/r-check-cran.yml b/.github/workflows/r-check-cran.yml
@@ -64,7 +64,11 @@ jobs:
           done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
           ## Force-install netcdf since it's missed by the system requirements
           ## but required for mzR & MSnbase
+<<<<<<< HEAD
           sudo -s apt-get install -y libnetcdf-dev
+=======
+          apt-get install -y libnetcdf-dev
+>>>>>>> 8adbe5adb872818d635f109c0d81046725aaae50
 
       - name: Install BiocManager
         run: |