mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 19:35:50 +00:00
Code Activity

merge

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-04-30 15:59:01 -07:00
parent ef31b27d5e
commit 832803b213
1 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/api/java/Context.java
View file

@ -2549,14 +2549,9 @@ public class Context implements AutoCloseable {
* set of assertions returned are the ones in the
* last scope level.
**/
<<<<<<< HEAD
public BoolExpr[] parseSMTLIB2String(String str, Symbol[] sortNames,
Sort[] sorts, Symbol[] declNames, FuncDecl[] decls)
=======
public BoolExpr parseSMTLIB2String(String str, Symbol[] sortNames,
Sort[] sorts, Symbol[] declNames, FuncDecl[] decls)
>>>>>>> fc719a5ee82361ffedb9ef46793e3401fdc32cc5
{
int csn = Symbol.arrayLength(sortNames);
int cs = Sort.arrayLength(sorts);