try and fix merge conflict

DESCRIPTION

@@ -1,10 +1,11 @@
 Package: phsopendata
 Title: Extract Open Data from opendata.nhs.scot
-Version: 0.1.0
+Version: 0.1.0.9000
 Authors@R: c(
     person("Csilla", "Scharle", , "[email protected]", role = c("aut", "cre")),
     person("James", "McMahon", , "[email protected]", role = "aut"),
-    person("David", "Aikman", , "[email protected]", role = "aut")
+    person("David", "Aikman", , "[email protected]", role = "aut"),
+    person("Ross", "Hull", , "[email protected]", role = "aut")
   )
 Description: Functions to extract and interact with data from the Scottish
     Health and Social Care Open Data platform.

NEWS.md

@@ -1,3 +1,15 @@
+# phsopendata (development version)
+
+- `get_dataset()` and `get_resource()` gain a new parameter `include_context` 
+which allows adding context such as the resource ID and modified / created 
+dates to returned data (#24).
+- The magrittr pipe (`%>%`) is now exported (#29).
+- `get_dataset()` will now suggest multiple dataset names, when the dataset 
+you've asked for doesn't exist (i.e. there's a typo) and there are multiple 
+likely candidates  (#28).
+- Two new functions `list_datasets()` and `list_resources()` allow browsing
+available datasets and resources (#10).
+
 # phsopendata 0.1.0 (2021-07-22)
 
 - Initial package release. 

R/get_dataset_additional_info.R

@@ -11,6 +11,7 @@
 #' get_dataset("gp-practice-populations")
 get_dataset_additional_info <- function(dataset_name){
   #define query
+
   query <- list("id" = dataset_name)
   #fetch the data
   content <- phs_GET("package_show", query)
@@ -19,6 +20,7 @@ get_dataset_additional_info <- function(dataset_name){
   amount_of_resources <- content$result$resources %>%
     length()
 
+
   #get the last recourse created and modified dates
   last_resource_created_date <- purrr::map_chr(content$result$resources, ~.$created)
   last_resource_modified_date <- purrr::map_chr(content$result$resources, ~.$last_modified)
@@ -27,13 +29,11 @@ get_dataset_additional_info <- function(dataset_name){
   most_recent_resource_date <- max(last_resource_modified_date, last_resource_created_date) %>%
     as.POSIXct(format = "%FT%X", tz = "UTC")
 
+
   #create tibble to return
   return_value <- tibble::tibble("name" = dataset_name,
                          "amount_of_resources" = amount_of_resources,
                          "most_recent_resource_update" = most_recent_resource_date)
 
   return(return_value)
-
 }
-
-

R/list_datasets.R

@@ -13,11 +13,8 @@ list_datasets <- function() {
 
   data_sets <- tibble::tibble("name" = unlist(data_sets))
 
-  return(data_sets)}
-
-
-
 
+  return(data_sets)}