Resolve conflict

Author: ThomasKnecht

R/position-nudgestack.R

@@ -39,6 +39,7 @@ position_nudgestack <- function(x = 0, y = 0, vjust = 1, reverse = FALSE) {
 PositionNudgeStack <- ggproto("PositionNudgeStack", Position,
   x = 0,
   y = 0,
+  type = NULL,
   vjust = 1,
   fill = FALSE,
   reverse = FALSE,