Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
jiajic committed Oct 27, 2024
2 parents 8faa952 + 1d2d7f5 commit eeddaf5
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ Suggests:
testthat (>= 3.0.0),
knitr,
rmarkdown
Remotes:
drieslab/GiottoUtils,
drieslab/GiottoClass
Config/testthat/edition: 3
Collate:
'aux_defaults.R'
Expand Down

0 comments on commit eeddaf5

Please sign in to comment.