All Fields Hex

rebase + merge error fix

test/TestHelper.cpp

@@ -131,15 +131,7 @@ json_spirit::mObject& ImportTest::makeAllFieldsHex(json_spirit::mObject& _o)
 		if (std::find(std::begin(hashes), std::end(hashes), key) != std::end(hashes))
 			continue;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 		std::string str;
-=======
-		string str;
->>>>>>> All Fields Hex: VMTests
-=======
-		std::string str;
->>>>>>> All Fields Hex: block tests
 		json_spirit::mValue value = (*it).second;
 
 		if (value.type() == json_spirit::int_type)
@@ -148,22 +140,7 @@ json_spirit::mObject& ImportTest::makeAllFieldsHex(json_spirit::mObject& _o)
 			str = value.get_str();
 		else continue;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-		_o[key] = (str.substr(0, 2) == "0x") ? str : "0x" + toHex(toCompactBigEndian(toInt(str)));
-=======
-		_o[key] = (str.substr(0, 2) == "0x" ||
-					str.find("a") != string::npos ||
-					str.find("b") != string::npos ||
-					str.find("c") != string::npos ||
-					str.find("d") != string::npos ||
-					str.find("e") != string::npos ||
-					str.find("f") != string::npos
-					) ? str : "0x" + toHex(toCompactBigEndian(toInt(str)));
->>>>>>> All Fields Hex: VMTests
-=======
 		_o[key] = (str.substr(0, 2) == "0x") ? str : "0x" + toHex(toCompactBigEndian(toInt(str)));
->>>>>>> All Fields Hex: block tests
 	}
 	return _o;
 }