From e82fb9bc6e1014523062580624065fa4e04b1b1b Mon Sep 17 00:00:00 2001 From: Fredrik Gustafsson Date: Wed, 23 Jan 2013 12:25:52 +0100 Subject: Fixed merge issue --- lib/dialyzer/test/small_SUITE_data/results/empty_list_infimum | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'lib/dialyzer') 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 -- cgit v1.2.3