Merge branch 'master' of https://github.com/s87jackson/rfars

# Conflicts: # docs/articles/Save_local.html # docs/pkgdown.yml # docs/reference/compare_counts.html # docs/reference/counts.html # docs/reference/get_fars.html # docs/reference/get_gescrss.html # docs/search.json
s87jackson · Aug 8, 2023 · 0a15209 · 0a15209
2 parents 695f015 + aeabadf
commit 0a15209
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 0 deletions.
diff --git a/docs/articles/Save_local.html b/docs/articles/Save_local.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -5,7 +5,11 @@ articles:
   Crash_sequence_of_events: Crash_sequence_of_events.html
   Rural_roads: Rural_roads.html
   Save_local: Save_local.html
+<<<<<<< HEAD
 last_built: 2023-08-08T21:18Z
+=======
+last_built: 2023-08-08T20:15Z
+>>>>>>> aeabadf75a6c43010a374860b35a52c499ee72a8
 urls:
   reference: https://s87jackson.github.io/rfars/reference
   article: https://s87jackson.github.io/rfars/articles

diff --git a/docs/reference/compare_counts.html b/docs/reference/compare_counts.html
diff --git a/docs/reference/counts.html b/docs/reference/counts.html
diff --git a/docs/reference/get_fars.html b/docs/reference/get_fars.html
diff --git a/docs/reference/get_gescrss.html b/docs/reference/get_gescrss.html
diff --git a/docs/search.json b/docs/search.json