Fix semantic merge conflict in test and parser

This commit is contained in:
Tom Jack 2019-11-19 17:19:12 -06:00
parent 863dfbb39d
commit 1a3909affd

View File

@ -1,4 +1,5 @@
function cb(const a : address; const s : unit) : list(operation) * unit is function cb(const a : address; const s : unit) : list(operation) * unit is
const c : contract(unit) = get_entrypoint("%cb", a) ; block {
block { skip } const c : contract(unit) = get_entrypoint("%cb", a)
}
with (list transaction(unit, 0mutez, c) end, s) with (list transaction(unit, 0mutez, c) end, s)