aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src/ct_framework.erl
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2014-02-24 16:14:16 +0100
committerHenrik Nord <[email protected]>2014-02-24 16:14:44 +0100
commit109a06739bdbb5ca1e21cea2d4cf288fc0848d57 (patch)
tree25abfecf02dfb64fa2e5c0d8d47fce5c739e95cf /lib/common_test/src/ct_framework.erl
parentca693a05bda78d701ff8b47d851505098c79c077 (diff)
parentf2169928a77d5a6b2e3e069b8cf9b8f5300ed543 (diff)
downloadotp-109a06739bdbb5ca1e21cea2d4cf288fc0848d57.tar.gz
otp-109a06739bdbb5ca1e21cea2d4cf288fc0848d57.tar.bz2
otp-109a06739bdbb5ca1e21cea2d4cf288fc0848d57.zip
Merge branch 'fenollp/otp-edoc-usage-fixes'
* fenollp/otp-edoc-usage-fixes: Fix edoc usage errors OTP-11702
Diffstat (limited to 'lib/common_test/src/ct_framework.erl')
-rw-r--r--lib/common_test/src/ct_framework.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 54510a657a..580588fbd2 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -1417,7 +1417,7 @@ warn(_What) ->
true.
%%%-----------------------------------------------------------------
-%%% @spec add_data_dir(File0) -> File1
+%%% @spec add_data_dir(File0, Config) -> File1
add_data_dir(File,Config) when is_atom(File) ->
add_data_dir(atom_to_list(File),Config);