Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history
Merge branch 'master' of https://github.com/eblondel/geoflow

# Conflicts:
#	R/geoflow_action_geometa_create_iso_19115.R
  • Loading branch information
eblondel committed Feb 13, 2021
2 parents 55571e7 + 8cd79a6 commit 53530e9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion R/geoflow_action_geometa_create_iso_19115.R
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ geometa_create_iso_19115 <- function(entity, config, options){
featureid <- if(!is.null(options$featureid)){ options$featureid } else { if(!is.null(features)) colnames(features)[1] else NULL}
geographySubject <- if(!is.null(options$subject_geography)) options$subject_geography else "geography"

createResponsibleParty = function(x, role=NULL){
createResponsibleParty = function(x, role = NULL){
if(is.null(role)) role <- x$role
rp <- ISOResponsibleParty$new()
if(is.null(x$firstName)) x$firstName = NA
Expand Down

0 comments on commit 53530e9

Please sign in to comment.