From e2e0afaff313ff515709405eb9f87221367a3082 Mon Sep 17 00:00:00 2001
From: Sebastian Campbell <sebastian.campbell@fao.org>
Date: Tue, 28 Mar 2017 13:45:42 +0200
Subject: [PATCH] Explicitly used dplyr's `contains` as there's a conflict with
 purrr

See https://github.com/tidyverse/purrr/issues/217. This will be fixed in the next release.
---
 run.R | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/run.R b/run.R
index 3befd47..7acc77f 100755
--- a/run.R
+++ b/run.R
@@ -274,7 +274,7 @@ if (want_to_bulk){
   meta_base <- data_frame()
   # for(i in 60:nrow(csv_data)){
   for(i in 1:nrow(csv_data)){
-    if (i %in% c(36 # excange rate
+    if (i %in% c(36 # exchange rate
                  )) next()
     df <- read_csv(csv_data$filepath[i])
     names(df) <- tolower(gsub(" |\\.", "", names(df)))
@@ -282,7 +282,7 @@ if (want_to_bulk){
                         vardata$new[match(names(df), vardata$old)],names(df))
     if (any(grepl("-",df$year))) df$year <- as.character(as.integer(gsub("-.+$", "", df$year)) + 1)
     df %>% 
-      select(-contains("year"), -contains("country"),-contains("flag")) %>% 
+      select(-dplyr::contains("year"), -dplyr::contains("country"),-dplyr::contains("flag")) %>% 
       distinct() %>% 
       mutate(unit = as.character(unit)) %>% 
       bind_rows(meta_base, .) -> meta_base