mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-16 13:58:45 +00:00
Code Activity

local updates

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-08-12 19:26:06 -07:00
parent 276bef1c20
commit 311183e19a
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/sat/sat_mus.cpp
View file

@ -100,11 +100,7 @@ namespace sat {
}
TRACE("sat", tout << "new core: " << mus << "\n";);
set_core();
<<<<<<< HEAD
IF_VERBOSE(2, verbose_stream() << "(sat.mus.new " << core << ")\n";);
=======
IF_VERBOSE(2, verbose_stream() << "(sat.mus.new " << m_core << ")\n";);
>>>>>>> 180b0d4ec915c84b770bb609fae4e462118cde50
return l_true;
}