summaryrefslogtreecommitdiffstats
path: root/vespajlib/src/main/java/com/yahoo/tensor/functions/Merge.java
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2022-02-16 16:43:20 +0100
committerJon Bratseth <bratseth@gmail.com>2022-02-16 16:43:20 +0100
commite25d913b884339afc4f8e3073e4e4b795e55d930 (patch)
tree408e9fded165a07fae202fd691f6f2864680ac63 /vespajlib/src/main/java/com/yahoo/tensor/functions/Merge.java
parent6f99bd502132cd378124a40060ac1d74d54f5e92 (diff)
Resolve slice dimension
Diffstat (limited to 'vespajlib/src/main/java/com/yahoo/tensor/functions/Merge.java')
-rw-r--r--vespajlib/src/main/java/com/yahoo/tensor/functions/Merge.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Merge.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Merge.java
index bd42e95a59e..adc84225a63 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Merge.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Merge.java
@@ -70,7 +70,7 @@ public class Merge<NAMETYPE extends Name> extends PrimitiveTensorFunction<NAMETY
}
@Override
- public String toString(ToStringContext context) {
+ public String toString(ToStringContext<NAMETYPE> context) {
return "merge(" + argumentA.toString(context) + ", " + argumentB.toString(context) + ", " + merger + ")";
}