From 311183e19ac598aa0bb686ded4f12b810ba93318 Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Tue, 12 Aug 2014 19:26:06 -0700
Subject: [PATCH] local updates

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
---
 src/sat/sat_mus.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/sat/sat_mus.cpp b/src/sat/sat_mus.cpp
index a3685869a..c67ff9b29 100644
--- a/src/sat/sat_mus.cpp
+++ b/src/sat/sat_mus.cpp
@@ -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;
     }