Merge branch 'fix-dev' into 'dev'

Fix semantic merge conflict in test and parser

See merge request ligolang/ligo!205
This commit is contained in:
Tom Jack 2019-11-20 00:07:21 +00:00
commit e9319b518c

View File

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