diff options
Diffstat (limited to 'binaryview.cpp')
| -rw-r--r-- | binaryview.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/binaryview.cpp b/binaryview.cpp index 59f14eef..3953cee6 100644 --- a/binaryview.cpp +++ b/binaryview.cpp @@ -2446,7 +2446,6 @@ uint64_t BinaryView::GetPreviousDataVariableStartBeforeAddress(uint64_t addr) } -<<<<<<< HEAD bool BinaryView::ParsePossibleValueSetString(const string& value, BNRegisterValueType state, PossibleValueSet& result, uint64_t here, string& errors) { BNPossibleValueSet res; |