resolving conflict

Merge branch 'main' into pre-release-cleanup@main # Conflicts: # R/utils.R # man/check_simple_name.Rd
insightsengineering · Jan 11, 2024 · 93e6b9d · 93e6b9d
2 parents 44df7a1 + 6202bc8
commit 93e6b9d
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 74 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Type: Package
 Package: teal.data
 Title: Data Model for 'teal' Applications
-Version: 0.3.0.9032
-Date: 2024-01-05
+Version: 0.3.0.9033
+Date: 2024-01-11
 Authors@R: c(
     person("Dawid", "Kaledkowski", , "[email protected]", role = c("aut", "cre")),
     person("Pawel", "Rucki", , "[email protected]", role = "aut"),

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# teal.data 0.3.0.9032
+# teal.data 0.3.0.9033
 
 ### Enhancements
 

diff --git a/R/utils.R b/R/utils.R
diff --git a/man/check_simple_name.Rd b/man/check_simple_name.Rd
diff --git a/tests/testthat/test-check_simple_name.R b/tests/testthat/test-check_simple_name.R