diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-01-23 12:25:52 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-01-23 12:25:52 +0100 |
| commit | e82fb9bc6e1014523062580624065fa4e04b1b1b (patch) | |
| tree | 5278d3623b81477bffcbd4a991a68257040840b7 /lib | |
| parent | 43a6ac4f8fd48ae9498ae1f29b09574e2864270f (diff) | |
| download | otp-e82fb9bc6e1014523062580624065fa4e04b1b1b.tar.gz otp-e82fb9bc6e1014523062580624065fa4e04b1b1b.tar.bz2 otp-e82fb9bc6e1014523062580624065fa4e04b1b1b.zip | |
Fixed merge issue
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dialyzer/test/small_SUITE_data/results/empty_list_infimum | 6 |
1 files changed, 1 insertions, 5 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 75f1b25725..6eaf60b91d 100644 --- a/lib/dialyzer/test/small_SUITE_data/results/empty_list_infimum +++ b/lib/dialyzer/test/small_SUITE_data/results/empty_list_infimum @@ -1,6 +1,2 @@ -<<<<<<< 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 +empty_list_infimum.erl:38: Invalid type specification for function empty_list_infimum:list_vhost_permissions/1. The success typing is (_) -> [[{_,_}]]
\ No newline at end of file |