checks

dime-worldbank · May 16, 2024 · 7f3bf7c · 7f3bf7c
2 parents 8af6a81 + 6f46d25
commit 7f3bf7c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,10 @@
 Package: googletraffic
 Title: Google Traffic
+<<<<<<< HEAD
 Version: 0.1.5
+=======
+Version: 0.1.4
+>>>>>>> 6f46d251b8f9ff2db2790082b53c9dfc3b4f9ead
 Authors@R: 
     person("Robert", "Marty", , "rmarty@worldbank.org", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-3164-3813"))