diff options
| author | Siri Hansen <[email protected]> | 2014-06-16 15:04:29 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-06-16 15:04:29 +0200 |
| commit | 09c5e12074516cfa0d6320a1de2a5bb1afd606a8 (patch) | |
| tree | 4ff0a8112777b9f625a322bbb50e49dc711c242f | |
| parent | a1cf2dfb9382402a6e85e1e8367ba918eb722c6b (diff) | |
| parent | dbd201a56e652c3dbe031896644755d2e5c84af0 (diff) | |
| download | otp-09c5e12074516cfa0d6320a1de2a5bb1afd606a8.tar.gz otp-09c5e12074516cfa0d6320a1de2a5bb1afd606a8.tar.bz2 otp-09c5e12074516cfa0d6320a1de2a5bb1afd606a8.zip | |
Merge branch 'siri/reltool-typo/OTP-11977' into maint
* siri/reltool-typo/OTP-11977:
Fix typo in error message in reltool_server
| -rw-r--r-- | lib/reltool/src/reltool_server.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/reltool/src/reltool_server.erl b/lib/reltool/src/reltool_server.erl index 98eeed5c27..e7af4bd3f7 100644 --- a/lib/reltool/src/reltool_server.erl +++ b/lib/reltool/src/reltool_server.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2009-2013. All Rights Reserved. +%% Copyright Ericsson AB 2009-2014. 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 @@ -2030,7 +2030,7 @@ ensure_app_info(#app{name = Name, [BadVsn | _] -> reltool_utils:throw_error( "~w: Application version clash. " - "Multiple directories contains version ~tp.", + "Multiple directories contain version ~tp.", [Name,BadVsn]) end, FirstInfo = hd(AllInfo), |