diff options
author | Hans Nilsson <[email protected]> | 2017-06-20 10:41:39 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2017-06-20 10:41:39 +0200 |
commit | 1d504b5fff8d54838469b244282ec879ce74f19c (patch) | |
tree | 0eac13822a33b78a6120f727b5ef2506cde7cfaf /lib/observer/src/etop_txt.erl | |
parent | cdc5545536ddeedf9ae4db20464afa6565f4327d (diff) | |
parent | 22394371e45bda351acdcc65a8cbe06b09f2d449 (diff) | |
download | otp-1d504b5fff8d54838469b244282ec879ce74f19c.tar.gz otp-1d504b5fff8d54838469b244282ec879ce74f19c.tar.bz2 otp-1d504b5fff8d54838469b244282ec879ce74f19c.zip |
Merge branch 'hans/otp/update_copyright'
This fixes the missing updates after merge cdc5545536ddeedf9ae4db20464afa6565f4327d
whare the branch was rebased and merge after the previous copyright fix in
43718d3b81d7f3d08e25047e22d579801bbe5044
Diffstat (limited to 'lib/observer/src/etop_txt.erl')
-rw-r--r-- | lib/observer/src/etop_txt.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/observer/src/etop_txt.erl b/lib/observer/src/etop_txt.erl index f772d5cc6d..183641119a 100644 --- a/lib/observer/src/etop_txt.erl +++ b/lib/observer/src/etop_txt.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2002-2016. All Rights Reserved. +%% Copyright Ericsson AB 2002-2017. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. |