Resolve merge conflicts main
#142
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…g if the result is not UTF8 (i.e. if the string was initially not encoded) (cherry picked from commit a22a5b5)
(cherry picked from commit 1e72f44)
…base64` function (cherry picked from commit 3f377a9)
…ated if changed within a form
(cherry picked from commit d62de80)
(cherry picked from commit 3381f26)
(cherry picked from commit 279bc5c)
Create v0.1.1 release
Merge branch 'main' into jt-resolve_merge_conflicts_main # Conflicts: # DESCRIPTION # NEWS.md # R/fct_utils.R # inst/golem-config.yml # tests/testthat/_snaps/mod_review_forms.md # tests/testthat/fixtures/review_testdb.sqlite # tests/testthat/test-mod_review_forms.R
LDSamson
approved these changes
Nov 20, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.