summaryrefslogtreecommitdiff
path: root/tools/mergetools.py
diff options
context:
space:
mode:
Diffstat (limited to 'tools/mergetools.py')
-rw-r--r--tools/mergetools.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/mergetools.py b/tools/mergetools.py
index c25214c..5cb36c4 100644
--- a/tools/mergetools.py
+++ b/tools/mergetools.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2014, NORDUnet A/S.
+# Copyright (c) 2015, NORDUnet A/S.
# See LICENSE for licensing information.
import base64
import sys