author | haftmann |
Thu, 31 Mar 2011 09:43:36 +0200 | |
changeset 42178 | b992c8e6394b |
parent 42177 | 5cb4a2f4f2a4 |
child 42179 | 24662b614fd4 |
child 42184 | 1d4fae76ba5e |
src/HOL/HOL.thy | file | annotate | diff | comparison | revisions |
--- a/src/HOL/HOL.thy Thu Mar 31 08:28:03 2011 +0200 +++ b/src/HOL/HOL.thy Thu Mar 31 09:43:36 2011 +0200 @@ -1923,7 +1923,7 @@ and infixl 3 "&&" and infixl 2 "||" and "!(if (_)/ then (_)/ else (_))") (Haskell "True" and "False" and "not" - and infixl 3 "&&" and infixl 2 "||" + and infixr 3 "&&" and infixr 2 "||" and "!(if (_)/ then (_)/ else (_))") (Scala "true" and "false" and "'! _" and infixl 3 "&&" and infixl 1 "||"