diff options
| author | Björn Gustavsson <[email protected]> | 2016-03-02 15:15:55 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-03-02 15:15:55 +0100 |
| commit | f2f3093222b37dba42b6eb7e7c4cbecf7655305c (patch) | |
| tree | 241d91b8d92f5393a2463652d5c0aa32c175be9a /lib/inets | |
| parent | 630e42c7a6fcde6acec407653c5d948fdeb1d8d7 (diff) | |
| parent | 8480526b8fea311d7bca818caeb2687ee615e5dd (diff) | |
| download | otp-f2f3093222b37dba42b6eb7e7c4cbecf7655305c.tar.gz otp-f2f3093222b37dba42b6eb7e7c4cbecf7655305c.tar.bz2 otp-f2f3093222b37dba42b6eb7e7c4cbecf7655305c.zip | |
Merge branch 'bjorn/remove-test_server/OTP-12705'
* bjorn/remove-test_server/OTP-12705:
Remove multiple inclusion of ct.hrl
otp_SUITE: Remove handling of test_server application
Correct common_test.app.src
Diffstat (limited to 'lib/inets')
| -rw-r--r-- | lib/inets/test/ftp_suite_lib.erl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/inets/test/ftp_suite_lib.erl b/lib/inets/test/ftp_suite_lib.erl index 2f9170fa0c..f15fa2fa8d 100644 --- a/lib/inets/test/ftp_suite_lib.erl +++ b/lib/inets/test/ftp_suite_lib.erl @@ -23,7 +23,6 @@ -include_lib("common_test/include/ct.hrl"). --include_lib("common_test/include/ct.hrl"). -include("inets_test_lib.hrl"). %% Test server specific exports |