Skip to content

Resolve merge conflicts main#142

Merged
LDSamson merged 20 commits intodevfrom
jt-resolve_merge_conflicts_main
Nov 20, 2024
Merged

Resolve merge conflicts main#142
LDSamson merged 20 commits intodevfrom
jt-resolve_merge_conflicts_main

Conversation

@jthompson-arcus
Copy link
Copy Markdown
Collaborator

No description provided.

LDSamson and others added 19 commits November 15, 2024 12:10
…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)
(cherry picked from commit d62de80)
(cherry picked from commit 3381f26)
(cherry picked from commit 279bc5c)
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
@jthompson-arcus jthompson-arcus marked this pull request as ready for review November 19, 2024 20:34
Copy link
Copy Markdown
Collaborator

@LDSamson LDSamson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. I only made a tiny change in alignment

@LDSamson LDSamson merged commit 906daf8 into dev Nov 20, 2024
@LDSamson LDSamson deleted the jt-resolve_merge_conflicts_main branch November 20, 2024 09:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants