From 6ddca4091ab7df25ad6c6205061dfbba4f5a95ee Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Thu, 9 Dec 2021 08:26:51 -0800
Subject: [PATCH] merge

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
---
 src/math/polysat/solver.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/math/polysat/solver.cpp b/src/math/polysat/solver.cpp
index b773eac64..56561544f 100644
--- a/src/math/polysat/solver.cpp
+++ b/src/math/polysat/solver.cpp
@@ -465,7 +465,6 @@ namespace polysat {
             LOG("try-saturate");
             m_conflict.try_saturate(v);
             LOG("end-try-saturate");
->>>>>>> ed9c0b84f668548ee1c11f14185b08333baa6f72
         }
 
         search_iterator search_it(m_search);