aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2013-09-03 17:12:27 +0200
committerPeter Andersson <[email protected]>2013-09-03 17:12:27 +0200
commit3e5c8ed1f8821e28b33936708b589cfa5bd81f29 (patch)
treebc3b2c2151771a446e4202879d8ed0c34f4335ec
parent6ed228966a795a730da6d559c9c0e5a9b56986fc (diff)
parent3ab1980d6a0df1254e5a5d6a2e25c1296642b963 (diff)
downloadotp-3e5c8ed1f8821e28b33936708b589cfa5bd81f29.tar.gz
otp-3e5c8ed1f8821e28b33936708b589cfa5bd81f29.tar.bz2
otp-3e5c8ed1f8821e28b33936708b589cfa5bd81f29.zip
Merge branch 'maint'
-rw-r--r--lib/common_test/test/ct_gen_conn_SUITE_data/proto.erl25
1 files changed, 18 insertions, 7 deletions
diff --git a/lib/common_test/test/ct_gen_conn_SUITE_data/proto.erl b/lib/common_test/test/ct_gen_conn_SUITE_data/proto.erl
index 8fcd35e0a4..1d08ce167b 100644
--- a/lib/common_test/test/ct_gen_conn_SUITE_data/proto.erl
+++ b/lib/common_test/test/ct_gen_conn_SUITE_data/proto.erl
@@ -1,10 +1,21 @@
-%%% @author Peter Andersson <[email protected]>
-%%% @copyright (C) 2013, Peter Andersson
-%%% @doc
-%%%
-%%% @end
-%%% Created : 24 May 2013 by Peter Andersson <[email protected]>
-
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. 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
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
-module(proto).
-compile(export_all).