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

---
 binaryninjaapi.h | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'binaryninjaapi.h')

diff --git a/binaryninjaapi.h b/binaryninjaapi.h
index 637aeb10..f0f3ce89 100644
--- a/binaryninjaapi.h
+++ b/binaryninjaapi.h
@@ -1687,25 +1687,11 @@ namespace BinaryNinja {
 	struct UndoEntry
 	{
 		Ref<User> user;
-		std::string hash;
+		std::string id;
 		std::vector<UndoAction> actions;
 		uint64_t timestamp;
 	};
 
-	/*!
-
-		\ingroup coreapi
-	*/
-	struct MergeResult
-	{
-		BNMergeStatus status;
-		UndoAction action;
-		std::string hash;
-
-		MergeResult() : status(NOT_APPLICABLE) {}
-		MergeResult(const BNMergeResult& result);
-	};
-
 	/*!
 		\ingroup filemetadata
 	*/
@@ -1877,9 +1863,6 @@ namespace BinaryNinja {
 		bool CreateSnapshotedView(BinaryView* data, const std::string& viewName,
 								  const std::function<bool(size_t progress, size_t total)>& progressCallback);
 
-		MergeResult MergeUserAnalysis(const std::string& name, const std::function<bool(size_t, size_t)>& progress,
-		    const std::vector<std::string> excludedHashes = {});
-
 		/*! Start recording actions taken so they can be undone at some point
 		*/
 		void BeginUndoActions();
-- 
cgit v1.3.1