From 832803b213e4f4854b719305d02272ea87b2b04e Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Mon, 30 Apr 2018 15:59:01 -0700
Subject: [PATCH] merge

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
---
 src/api/java/Context.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/api/java/Context.java b/src/api/java/Context.java
index 7037814c2..dee9dbaf6 100644
--- a/src/api/java/Context.java
+++ b/src/api/java/Context.java
@@ -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);