From 1a3909affd2bcf10c9b5c9b5f2d434ce17cd66f1 Mon Sep 17 00:00:00 2001
From: Tom Jack <tom@tomjack.co>
Date: Tue, 19 Nov 2019 17:19:12 -0600
Subject: [PATCH] Fix semantic merge conflict in test and parser
---
src/test/contracts/entrypoints.ligo | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/test/contracts/entrypoints.ligo b/src/test/contracts/entrypoints.ligo
index 0464c98c7..1d49a468c 100644
--- a/src/test/contracts/entrypoints.ligo
+++ b/src/test/contracts/entrypoints.ligo
@@ -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)