diff options
author | Ingela Anderton Andin <[email protected]> | 2013-11-14 10:34:37 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2013-11-14 10:34:37 +0100 |
commit | f03339650039e4da871df142bd52f65f7aa586c1 (patch) | |
tree | 491a91dd4a267762d3407293fb1f40f404b676e0 /lib/ssh/src/ssh_channel_sup.erl | |
parent | ae7ae7d734b980294073ea43923167904349347c (diff) | |
parent | 19aedb5c0cb956e51b24fbba4923520efe7bf54b (diff) | |
download | otp-f03339650039e4da871df142bd52f65f7aa586c1.tar.gz otp-f03339650039e4da871df142bd52f65f7aa586c1.tar.bz2 otp-f03339650039e4da871df142bd52f65f7aa586c1.zip |
Merge remote-tracking branch 'upstream/maint'
Diffstat (limited to 'lib/ssh/src/ssh_channel_sup.erl')
-rw-r--r-- | lib/ssh/src/ssh_channel_sup.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_channel_sup.erl b/lib/ssh/src/ssh_channel_sup.erl index 0093bce9c2..ee37ed35f8 100644 --- a/lib/ssh/src/ssh_channel_sup.erl +++ b/lib/ssh/src/ssh_channel_sup.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2010. All Rights Reserved. +%% Copyright Ericsson AB 2008-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -31,7 +31,7 @@ -export([init/1]). %%%========================================================================= -%%% API +%%% Internal API %%%========================================================================= start_link(Args) -> supervisor:start_link(?MODULE, [Args]). |