summaryrefslogtreecommitdiff
path: root/undoaction.cpp
diff options
context:
space:
mode:
authorJosh Ferrell <josh@vector35.com>2023-02-15 17:24:20 -0500
committerJosh Ferrell <josh@vector35.com>2023-02-15 17:24:20 -0500
commit086435bd364505f7e05c8a83e48e8b5bec30c94d (patch)
tree9cbb582cea9a28aaf5bb61214a08968bd9d6dc6b /undoaction.cpp
parent5251311429098718270521173399182024516326 (diff)
Remove legacy BNDB Merge Tool
Diffstat (limited to 'undoaction.cpp')
-rw-r--r--undoaction.cpp11
1 files changed, 0 insertions, 11 deletions
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;
- }
-};