merging conflicts

Lindsay Carr · Lindsay Carr · commit 96cd65f3df19 · 2015-10-02T09:00:57.000-05:00
Merge branch 'master' of https://github.com/lindsaycarr/gsplot Conflicts: R/set_args.R
diff --git a/R/set_args.R b/R/set_args.R
@@ -101,7 +101,7 @@ set_legend_args <- function(object, fun.name, ..., legend.name) {
     
   } else if (fun.name %in% c("polygon", "rect")) {
     names(usr.args) <- replace(names(usr.args), which(names(usr.args)=="col"), "fill")
-    usr.args$lty <- NA #lty and lwd should always be NA for polygon & rectangles in the legend
+    usr.args$lty <- NA #lty/lwd should always be NA for polygon & rectangles in the legend
     usr.args$lwd <- NA  
     fun.specific <- list(border=par("fg"))
   }

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ set_legend_args <- function(object, fun.name, ..., legend.name) {`
`101`	`101`
`102`	`102`	`} else if (fun.name %in% c("polygon", "rect")) {`
`103`	`103`	`names(usr.args) <- replace(names(usr.args), which(names(usr.args)=="col"), "fill")`
`104`		`- usr.args$lty <- NA #lty and lwd should always be NA for polygon & rectangles in the legend`
	`104`	`+ usr.args$lty <- NA #lty/lwd should always be NA for polygon & rectangles in the legend`
`105`	`105`	`usr.args$lwd <- NA`
`106`	`106`	`fun.specific <- list(border=par("fg"))`
`107`	`107`	`}`