Resolve conflict

ThomasKnecht · Oct 1, 2019 · 5271987 · 5271987
1 parent 771918d
commit 5271987
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/R/position-nudgestack.R b/R/position-nudgestack.R
@@ -44,6 +44,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,