balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix-dev' into 'dev'

Browse Source 
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
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/test/contracts/entrypoints.ligo
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)