Ignore:
Timestamp:
Nov 24, 2010, 6:29:12 PM (9 years ago)
Author:
mulligan
Message:

Resolved conflicts.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Deliverables/D4.1/Matita/Bool.ma

    r268 r281  
    1111    ].
    1212   
    13 notation "hvbox(b ? t : f)"
     13notation "hvbox('if' b 'then' t 'else' f)"
    1414  non associative with precedence 83
    1515  for @{ 'if_then_else $b $t $f }.
     
    5050    [ true ⇒ false
    5151    | false ⇒ true
    52     ]. 
     52    ].
    5353 
Note: See TracChangeset for help on using the changeset viewer.