diff options
Diffstat (limited to 'lib/dialyzer')
| -rw-r--r-- | lib/dialyzer/test/small_SUITE_data/results/empty_list_infimum | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/dialyzer/test/small_SUITE_data/results/empty_list_infimum b/lib/dialyzer/test/small_SUITE_data/results/empty_list_infimum index 6f189099ed..75f1b25725 100644 --- a/lib/dialyzer/test/small_SUITE_data/results/empty_list_infimum +++ b/lib/dialyzer/test/small_SUITE_data/results/empty_list_infimum @@ -1,2 +1,6 @@ +<<<<<<< HEAD +empty_list_infimum.erl:39: Invalid type specification for function empty_list_infimum:list_vhost_permissions/1. The success typing is (_) -> [[{_,_}]] +======= empty_list_infimum.erl:38: Invalid type specification for function empty_list_infimum:list_vhost_permissions/1. The success typing is (_) -> [[{_,_}]] +>>>>>>> sa/dialyzer-list-spec/OTP-10740 |