summaryrefslogtreecommitdiff
path: root/binaryview.cpp
diff options
context:
space:
mode:
authorChinmay <chinmay1dd@gmail.com>2020-09-03 14:01:48 -0700
committerChinmay Deshpande <chinmay1dd@gmail.com>2020-09-10 08:45:04 -0700
commit78ae59ac4998ac66ff104f1ac6ef365b301feb43 (patch)
tree3a2a7b672e66903c1c843e3716d9a0ed3034922a /binaryview.cpp
parent10315ca50d1679a7f5ca865e500356bd246c4c4e (diff)
Adds tests related to UIDF
Diffstat (limited to 'binaryview.cpp')
-rw-r--r--binaryview.cpp1
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;