Conflicts:
	libevm/VM.h
This commit is contained in:
CJentzsch 2014-12-01 22:44:31 +01:00
parent 057553a0a0
commit fb7c3bb302
3 changed files with 37 additions and 38 deletions

View File

@ -96,7 +96,6 @@ void ImportTest::importEnv(json_spirit::mObject& _o)
m_statePre.m_currentBlock = m_environment.currentBlock;
}
void ImportTest::importState(json_spirit::mObject& _o, State& _state)
{
for (auto& i: _o)