diff options
| author | Erlang/OTP <[email protected]> | 2019-05-06 17:09:11 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-05-06 17:09:11 +0200 |
| commit | eb9b9e00b68a2cceafff60d55da74d72ab594ab4 (patch) | |
| tree | 17b514987fdef7e345805b4df9067f02a8ad0036 /.dir-locals.el | |
| parent | 49f6c8336411b7508f7bab2591fcefd7d3242de1 (diff) | |
| parent | 62ed4780f713d86a9bca332945bf583111570978 (diff) | |
| download | otp-eb9b9e00b68a2cceafff60d55da74d72ab594ab4.tar.gz otp-eb9b9e00b68a2cceafff60d55da74d72ab594ab4.tar.bz2 otp-eb9b9e00b68a2cceafff60d55da74d72ab594ab4.zip | |
Merge branch 'siri/ct/reset_curr_tc/ERIERL-334/OTP-15717' into maint-21
* siri/ct/reset_curr_tc/ERIERL-334/OTP-15717:
[ct] Cleanup after timetrap timeout or kill during framework call or hook
# Conflicts:
# lib/common_test/test/Makefile
Diffstat (limited to '.dir-locals.el')
0 files changed, 0 insertions, 0 deletions