fix conflict

ropensci · Nov 14, 2020 · 802951e · 802951e
2 parents 7ead6b9 + 4dc510c
commit 802951e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cran-comments.md b/cran-comments.md
@@ -5,7 +5,8 @@ tidyhydat 0.5.2
 
 ## Test environments
 * win-builder (via `devtools::check_win_devel()` and `devtools::check_win_release()`)
-* local Windows 10, R 4.0.2 (via R CMD check --as-cran)
+* local Windows 10, R 4.0.3 (via R CMD check --as-cran)
+>>>>>>> chk-tbls
 * ubuntu-20.04, r: 'release' (github actions)
 * ubuntu-20.04, r: 'devel' (github actions)
 * macOS,        r: 'release' (github actions)