Merge branch 'rinderknecht-dev' of gitlab.com:ligolang/ligo into rinderknecht-dev
This commit is contained in:
commit
81868ca3b2
@ -49,6 +49,10 @@ type kwd_contains = Region.t
|
||||
type kwd_down = Region.t
|
||||
type kwd_else = Region.t
|
||||
type kwd_end = Region.t
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
type kwd_fail = Region.t
|
||||
>>>>>>> e5e9fb8e2faa1a67595553ab83279d3eb2b64470
|
||||
type kwd_for = Region.t
|
||||
type kwd_from = Region.t
|
||||
type kwd_function = Region.t
|
||||
|
@ -33,6 +33,10 @@ type kwd_contains = Region.t
|
||||
type kwd_down = Region.t
|
||||
type kwd_else = Region.t
|
||||
type kwd_end = Region.t
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
type kwd_fail = Region.t
|
||||
>>>>>>> e5e9fb8e2faa1a67595553ab83279d3eb2b64470
|
||||
type kwd_for = Region.t
|
||||
type kwd_from = Region.t
|
||||
type kwd_function = Region.t
|
||||
|
@ -53,6 +53,10 @@
|
||||
%token <Region.t> Down (* "down" *)
|
||||
%token <Region.t> Else (* "else" *)
|
||||
%token <Region.t> End (* "end" *)
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
%token <Region.t> Fail (* "fail" *)
|
||||
>>>>>>> e5e9fb8e2faa1a67595553ab83279d3eb2b64470
|
||||
%token <Region.t> For (* "for" *)
|
||||
%token <Region.t> Function (* "function" *)
|
||||
%token <Region.t> From (* "from" *)
|
||||
|
Loading…
Reference in New Issue
Block a user