Skip to content

Commit

Permalink
merge back from main
Browse files Browse the repository at this point in the history
Merge branch 'main' into additional_changes@273-pre-release-activities@main

# Conflicts:
#	DESCRIPTION
#	R/utils.R
#	man/split_text_block.Rd
#	man/teal.reporter-package.Rd
  • Loading branch information
kartikeyakirar committed Feb 19, 2024
2 parents 58a60cd + fc39625 commit 37db571
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
9 changes: 2 additions & 7 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
Package: teal.reporter
Title: Reporting Tools for 'shiny' Modules
Version: 0.2.1.9019
Date: 2024-02-16
Version: 0.3.0.9000
Date: 2024-02-19
Authors@R: c(
person("Dawid", "Kaledkowski", , "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0000-0001-9533-457X")),
person("Aleksander", "Chlebowski", , "[email protected]", role = "aut",
comment = c(ORCID = "0000-0001-5018-6294")),
person("Andre", "Verissimo", , "[email protected]", role = "aut",
comment = c(ORCID = "0000-0002-2212-339X")),
person("Kartikeya", "Kirar", , "[email protected]", role = "aut",
comment = c(ORCID = "0009-0005-1258-4757")),
person("Vedha", "Viyash", , "[email protected]", role = "aut"),
person("Marcin", "Kosinski", , "[email protected]", role = "aut"),
person("Maciej", "Nasinski", role = "aut"),
person("Konrad", "Pagacz", role = "aut"),
Expand Down
4 changes: 3 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# teal.reporter 0.2.1.9019
# teal.reporter 0.3.0.9000

# teal.reporter 0.3.0

### Enhancements

Expand Down
3 changes: 0 additions & 3 deletions man/teal.reporter-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 37db571

Please sign in to comment.