summaryrefslogtreecommitdiffstats
path: root/vespajlib
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2020-01-06 10:24:04 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2020-01-06 10:24:04 +0100
commit6ebe10ce23b067facf72174384a1a8d0f7708854 (patch)
treeb12918c0434363b4e002e3a002d9be0b00a2bc17 /vespajlib
parent4c7de85c3933e4842784a453370247d533ee4102 (diff)
Up to date copyright heading
Diffstat (limited to 'vespajlib')
-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 cb6b5b90624..d5633bde36c 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Merge.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Merge.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.tensor.functions;
import com.google.common.collect.ImmutableList;