cleanup

DESCRIPTION

@@ -1,18 +1,14 @@
 Package: googletraffic
 Title: Google Traffic
-<<<<<<< HEAD
 Version: 0.1.5
-=======
-Version: 0.1.4
->>>>>>> 6f46d251b8f9ff2db2790082b53c9dfc3b4f9ead
 Authors@R: 
     person("Robert", "Marty", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-3164-3813"))
 Description: Create geographically referenced traffic data from the Google Maps JavaScript API <https://developers.google.com/maps/documentation/javascript/examples/layer-traffic>.
 License: MIT + file LICENSE
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.1
+RoxygenNote: 7.3.1
 URL: https://dime-worldbank.github.io/googletraffic/
 BugReports: https://github.com/dime-worldbank/googletraffic/issues
 Imports: