Commit 9a0c653b authored by Laurent MEYER's avatar Laurent MEYER
Browse files

Resolved conflict in SDL grammar due to a merge

parent fc96395c
...@@ -1275,13 +1275,10 @@ ENDNEWTYPE : E N D N E W T Y P E; ...@@ -1275,13 +1275,10 @@ ENDNEWTYPE : E N D N E W T Y P E;
ARRAY : A R R A Y; ARRAY : A R R A Y;
CONSTANTS : C O N S T A N T S; CONSTANTS : C O N S T A N T S;
STRUCT : S T R U C T; STRUCT : S T R U C T;
<<<<<<< HEAD
SYNONYM : S Y N O N Y M; SYNONYM : S Y N O N Y M;
=======
IMPORT : I M P O R T; IMPORT : I M P O R T;
VIEW : V I E W; VIEW : V I E W;
ACTIVE : A C T I V E; ACTIVE : A C T I V E;
>>>>>>> remotes/upstream/master
StringLiteral : STR+ ; StringLiteral : STR+ ;
fragment fragment
......
This diff is collapsed.
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment