mirror of
https://github.com/Z3Prover/z3
synced 2025-04-23 17:15:31 +00:00
import master branch
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
b1597fd499
commit
0353177fe0
5 changed files with 65 additions and 84 deletions
|
@ -129,11 +129,7 @@ namespace lp_api {
|
|||
st.update("arith-gomory-cuts", m_gomory_cuts);
|
||||
st.update("arith-assume-eqs", m_assume_eqs);
|
||||
st.update("arith-branch", m_branch);
|
||||
<<<<<<< HEAD
|
||||
st.update("arith-bv-axioms", m_bv_axioms);
|
||||
=======
|
||||
st.update("arith-band-axioms", m_band_axioms);
|
||||
>>>>>>> c72780d9b (b-and, stats, reinsert variable to heap, debugging)
|
||||
}
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue