mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-16 05:48:44 +00:00
Code Activity

resolved conflicts

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2013-04-23 10:02:37 -07:00
parent a1277a57ae
commit 6250a29602
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/smt/theory_diff_logic_def.h
View file

@ -374,12 +374,6 @@ final_check_status theory_diff_logic<Ext>::final_check_eh() {
// either will already be zero (as we don't do mixed constraints).
m_graph.set_to_zero(m_zero_int, m_zero_real);
SASSERT(is_consistent());
<<<<<<< HEAD
=======
>>>>>>> d849dbf21f218663e9c9ffa01eea168c7b7765c9
if (m_non_diff_logic_exprs) {
return FC_GIVEUP;
}