fix to controls_if_elseif maybe be aborted during merge
@@ -406,7 +406,7 @@ Blockly.Blocks['controls_if'] = {
// Rebuild block.
for (var i = 1; i <= this.elseifCount_; i++) {
this.appendValueInput('IF' + i)
- .setCheck('Boolean')
+ .setCheck([Number,Boolean])
.appendField(Blockly.Msg['CONTROLS_IF_MSG_ELSEIF']);
this.appendStatementInput('DO' + i)
.appendField(Blockly.Msg['CONTROLS_IF_MSG_THEN']);
