All Fields Hex: block tests

test/TestHelper.cpp

@@ -131,11 +131,15 @@ 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)
@@ -144,6 +148,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)));
 =======
@@ -156,6 +161,9 @@ json_spirit::mObject& ImportTest::makeAllFieldsHex(json_spirit::mObject& _o)
 					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;
 }