From 78ae59ac4998ac66ff104f1ac6ef365b301feb43 Mon Sep 17 00:00:00 2001
From: Chinmay <chinmay1dd@gmail.com>
Date: Thu, 3 Sep 2020 14:01:48 -0700
Subject: Adds tests related to UIDF

---
 binaryview.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'binaryview.cpp')

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;
-- 
cgit v1.3.1