diff options
| author | Linus Nordberg <linus@nordberg.se> | 2014-10-29 15:06:39 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordberg.se> | 2014-10-29 15:06:39 +0100 |
| commit | 5a10cf6fa6fff3cbca3340a7c75120603bda18ca (patch) | |
| tree | cdc3a32a1fb4f5719bfdb94fa106e28206d41cf4 /tools | |
| parent | 4325a43d3d1476cc601b631620df89340ec4c7e2 (diff) | |
Copyright NORDUnet.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/merge.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/merge.py b/tools/merge.py index 7120d04..41144ea 100755 --- a/tools/merge.py +++ b/tools/merge.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (c) 2014 Kungliga Tekniska Högskolan -# (KTH Royal Institute of Technology, Stockholm, Sweden). +# +# Copyright (c) 2014, NORDUnet A/S. # See LICENSE for licensing information. import json |