author | haftmann |
Mon, 27 Sep 2010 11:11:59 +0200 | |
changeset 39715 | 9094200d7988 |
parent 39714 | 56c98c820a90 |
child 39716 | d1c12f4ee9ac |
src/HOL/HOL.thy | file | annotate | diff | comparison | revisions |
--- a/src/HOL/HOL.thy Mon Sep 27 09:36:18 2010 +0200 +++ b/src/HOL/HOL.thy Mon Sep 27 11:11:59 2010 +0200 @@ -1915,7 +1915,7 @@ and infixl 1 "andalso" and infixl 0 "orelse" and "!(if (_)/ then (_)/ else (_))") (OCaml "true" and "false" and "not" - and infixl 4 "&&" and infixl 2 "||" + and infixl 3 "&&" and infixl 2 "||" and "!(if (_)/ then (_)/ else (_))") (Haskell "True" and "False" and "not" and infixl 3 "&&" and infixl 2 "||"