From 6250a29602026b8ecd79ebecb90c8951cb8a3dcf Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Tue, 23 Apr 2013 10:02:37 -0700
Subject: [PATCH] resolved conflicts

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
---
 src/smt/theory_diff_logic_def.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/smt/theory_diff_logic_def.h b/src/smt/theory_diff_logic_def.h
index 6700b4c37..aeb4f73d6 100644
--- a/src/smt/theory_diff_logic_def.h
+++ b/src/smt/theory_diff_logic_def.h
@@ -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; 
     }