Skip to content
Snippets Groups Projects
Commit 8398da33 authored by pycsham's avatar pycsham
Browse files

solving merge conflicts

parent a0c49ff8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 5 deletions
cfg/lr1GenInput.cfg
+ 1
− 5
View file @ 8398da33
......@@ -62,11 +62,7 @@ COMMA
PERIOD
COMPID
IMPORTALL
<<<<<<< HEAD
95
=======
99
>>>>>>> 22ebe365fa18e5d02e277d3e0c8bdc7e37d93e25
96
start
packageDcl
importDcls
......
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