mirror of
				https://github.com/ethereum/solidity
				synced 2023-10-03 13:03:40 +00:00 
			
		
		
		
	Fix merge conflict.
This commit is contained in:
		
							parent
							
								
									c35fdda2ec
								
							
						
					
					
						commit
						e9dc9c5baf
					
				| @ -2454,7 +2454,6 @@ void IRGeneratorForStatements::appendExternalFunctionCall( | ||||
| 	templ("retVars", retVars); | ||||
| 	solAssert(retVars.empty() == returnInfo.returnTypes.empty(), ""); | ||||
| 
 | ||||
| 	templ("roundUp", m_utils.roundUpFunction()); | ||||
| 	templ("abiDecode", m_context.abiFunctions().tupleDecoder(returnInfo.returnTypes, true)); | ||||
| 	templ("dynamicReturnSize", returnInfo.dynamicReturnSize); | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user