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

Fix: indentation

Browse Source
This commit is contained in:
Alain Mebsout 2018-05-23 12:05:27 +02:00 committed by Benjamin Canou
parent cf8532e8f7
commit 68f86fe274
2 changed files with 137 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/proto_alpha/lib_protocol/src/script_ir_translator.ml
View File

@ -758,9 +758,8 @@ let merge_field_annot
| Some `Field_annot a1, Some `Field_annot a2 -> | Some `Field_annot a1, Some `Field_annot a2 ->
if String.equal a1 a2 if String.equal a1 a2
then ok annot1 then ok annot1
else ok None else ok None (* TODO check this, do we want typechecking here ?
(* TODO check this, do we want typechecking here ? *) error (Inconsistent_annotations ("%" ^ a1, "%" ^ a2)) *)
(* error (Inconsistent_annotations ("%" ^ a1, "%" ^ a2)) *)
let merge_var_annot let merge_var_annot
: var_annot option -> var_annot option -> var_annot option : var_annot option -> var_annot option -> var_annot option