From 086435bd364505f7e05c8a83e48e8b5bec30c94d Mon Sep 17 00:00:00 2001
From: Josh Ferrell <josh@vector35.com>
Date: Wed, 15 Feb 2023 17:24:20 -0500
Subject: Remove legacy BNDB Merge Tool

---
 undoaction.cpp | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'undoaction.cpp')

diff --git a/undoaction.cpp b/undoaction.cpp
index 99196280..73caa5bc 100644
--- a/undoaction.cpp
+++ b/undoaction.cpp
@@ -35,14 +35,3 @@ UndoAction::UndoAction(const BNUndoAction& action)
 		summaryTokens.push_back(action.summaryTokens[i]);
 	}
 }
-
-
-MergeResult::MergeResult(const BNMergeResult& result)
-{
-	status = result.status;
-	if (status == BNMergeStatus::CONFLICT)
-	{
-		action = result.action;
-		hash = result.hash;
-	}
-};
-- 
cgit v1.3.1