Fixed merge error during rebase

theano/ifelse.py

@@ -348,14 +348,6 @@ def ifelse(condition, then_branch, else_branch, name=None):
                         'branch.' %
                         (then_branch_elem.type, else_branch_elem.type))
 
-                raise ValueError(
-                         ('The two branches should have identical types, '
-                          ' but they are '+str(then_branch_elem.type)+' and '+
-                          str(else_branch_elem.type)+' respectively. '
-                          'This error could be raised if for example '
-                          ' you provided a one element list on the then '
-                          ' branch but a tensor on the else branch'))
-
         new_then_branch.append(then_branch_elem)
         new_else_branch.append(else_branch_elem)