resolved merge conflicts
authorPaulMeng <pmtruth@hotmail.com>
Tue, 5 Jul 2016 18:21:11 +0000 (14:21 -0400)
committerPaulMeng <pmtruth@hotmail.com>
Tue, 5 Jul 2016 18:21:11 +0000 (14:21 -0400)
commit0294ec0d13c631bf471c07ba26809cda0f0b9b51
tree9e7e93259ac0ee91424bd515e4d7b2df76569231
parent36a0d1d948f201471596e092136c5a00103f78af
resolved merge conflicts
src/expr/datatype.h
src/expr/expr_manager_template.h
src/theory/bv/bitblaster_template.h
src/theory/sets/theory_sets_private.h