fix conflicts with main

epiverse-trace · Sep 20, 2023 · 25163ba · 25163ba
1 parent 40b5b6b
commit 25163ba
Show file tree

Hide file tree

Showing 105 changed files with 1,099 additions and 10,979 deletions.
diff --git a/.Rhistory b/.Rhistory
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -84,7 +84,6 @@ jobs:
       - uses: r-lib/actions/check-r-package@v2
         id: rcmdcheck
         with:
-<<<<<<< HEAD
           upload-snapshots: true
 
       # fail-fast but only if rcmdcheck step fails
@@ -93,6 +92,3 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         if: always() && steps.rcmdcheck.outcome == 'failure'
         run: gh run cancel ${{ github.run_id }}
-=======
-          upload-snapshots: true
->>>>>>> main
diff --git a/.github/workflows/render_readme.yml b/.github/workflows/render_readme.yml
@@ -42,11 +42,7 @@ jobs:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Checkout repos
-<<<<<<< HEAD
         uses: actions/checkout@v3
-=======
-        uses: actions/checkout@v2
->>>>>>> main
 
       - name: Setup R
         uses: r-lib/actions/setup-r@v2
@@ -55,16 +51,11 @@ jobs:
 
       - name: Setup pandoc
         uses: r-lib/actions/setup-pandoc@v2
-<<<<<<< HEAD
 
-=======
-
->>>>>>> main
       - name: Install dependencies
         uses: r-lib/actions/setup-r-dependencies@v2
         with:
           extra-packages: any::rmarkdown, local::.
-<<<<<<< HEAD
 
       - name: Compile the readme
         run: |
@@ -81,21 +72,6 @@ jobs:
             output_file = "README.md",
             output_dir  = "."
           )
-=======
-
-      - name: Compile the readme
-        run: |
-          tf <- tempfile(fileext = ".Rmd")
-          writeLines(
-            knitr::knit_expand(
-              "README.Rmd", 
-              packagename = read.dcf("DESCRIPTION", "Package"), 
-              gh_repo = Sys.getenv("GITHUB_REPOSITORY")
-            ), 
-            tf
-          )
-          rmarkdown::render(tf, output_file = "README.md", output_dir = ".")
->>>>>>> main
         shell: Rscript {0}
 
       - name: Commit files
@@ -109,8 +85,4 @@ jobs:
             git add man/figures/
           fi
           git diff-index --quiet HEAD || git commit -m "Automatic readme update"
-<<<<<<< HEAD
-          git push origin || echo "No changes to push"
-=======
           git push origin || echo "No changes to push"
->>>>>>> main
diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -51,13 +51,9 @@ jobs:
 
       - name: Test coverage
         run: covr::codecov(quiet = FALSE)
-<<<<<<< HEAD
         shell: Rscript {0}
 
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-=======
-        shell: Rscript {0}
->>>>>>> main