From 10315ca50d1679a7f5ca865e500356bd246c4c4e Mon Sep 17 00:00:00 2001
From: Xusheng <xusheng@vector35.com>
Date: Mon, 31 Aug 2020 17:53:02 +0800
Subject: allow redefining an existing type

---
 binaryview.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'binaryview.cpp')

diff --git a/binaryview.cpp b/binaryview.cpp
index 3953cee6..59f14eef 100644
--- a/binaryview.cpp
+++ b/binaryview.cpp
@@ -2446,6 +2446,7 @@ 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