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;
ARRAY : A R R A Y;
CONSTANTS : C O N S T A N T S;
STRUCT : S T R U C T;
<<<<<<< HEAD
SYNONYM : S Y N O N Y M;
=======
IMPORT : I M P O R T;
VIEW : V I E W;
ACTIVE : A C T I V E;
>>>>>>> remotes/upstream/master
StringLiteral : STR+ ;
fragment
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
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