From 200c98556926ef94efe95e451c7bafc5aec8b694 Mon Sep 17 00:00:00 2001
From: wkumler <wkumler@uw.edu>
Date: Thu, 30 Nov 2023 10:11:50 -0800
Subject: [PATCH] I thought I literally just removed this but ok

---
 .github/workflows/r-check-cran.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/r-check-cran.yml b/.github/workflows/r-check-cran.yml
index 6dbb78d..94b1f8c 100644
--- a/.github/workflows/r-check-cran.yml
+++ b/.github/workflows/r-check-cran.yml
@@ -64,11 +64,7 @@ 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: |