Merge branch 'master' of

https://denschu@github.com/denschu/xtext-whitespace.git Conflicts: com.denschu.xtext.whitespace/src/com/denschu/xtext/whitespace/MyDsl.xtext com.denschu.xtext.whitespace/src/com/denschu/xtext/whitespace/parser/IndentTokenSource.java
denschu · Mar 8, 2012 · 43da0be · 43da0be
2 parents 417b046 + 3fffab1
commit 43da0be
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/com.denschu.xtext.whitespace/src/com/denschu/xtext/whitespace/MyDsl.xtext b/com.denschu.xtext.whitespace/src/com/denschu/xtext/whitespace/MyDsl.xtext
@@ -12,4 +12,4 @@ Argument hidden() : ID (" " ID)*;
 terminal fragment WS: ('  ') (' ')*;
 terminal ID: ('a'..'z')+;
 terminal TAB: (WS | '\t')+;
-terminal EOL: ('\r'? '\n')+;
+terminal EOL: ('\r'? '\n')+;