aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-01-23 12:26:37 +0100
committerFredrik Gustafsson <[email protected]>2013-01-23 12:26:37 +0100
commit47de15b52c46bce34c9e0a172e54411622eb08f1 (patch)
tree2615741bd022dd2258660e7d89520a15edaeef08
parent56971970444f1d1209a638e7b248ff7ba0b85a40 (diff)
parente82fb9bc6e1014523062580624065fa4e04b1b1b (diff)
downloadotp-47de15b52c46bce34c9e0a172e54411622eb08f1.tar.gz
otp-47de15b52c46bce34c9e0a172e54411622eb08f1.tar.bz2
otp-47de15b52c46bce34c9e0a172e54411622eb08f1.zip
Merge branch 'fredrik/fix-merge-dialyzer/R16'
* fredrik/fix-merge-dialyzer/R16: Fixed merge issue
-rw-r--r--lib/dialyzer/test/small_SUITE_data/results/empty_list_infimum6
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