Permalink
Browse files

Merge pull request #148 from GerHobbelt/pullreq-4

Pullreq 4 - (cherrypicked) remove duplicate constant definition
  • Loading branch information...
2 parents 3cf1d09 + 990ce75 commit a90031564d52c551a5a25cf9a520bb7aea99adc3 @zaach committed Feb 16, 2013
Showing with 4 additions and 1 deletion.
  1. +4 −0 .gitignore
  2. +0 −1 lib/jison.js
View
@@ -1,2 +1,6 @@
.DS_Store
node_modules
+
+# Editor backup files
+*.bak
+*~
View
@@ -733,7 +733,6 @@ lrGeneratorMixin.canonicalCollectionInsert = function canonicalCollectionInsert
var NONASSOC = 0;
lrGeneratorMixin.parseTable = function parseTable (itemSets) {
- var NONASSOC = 0;
var states = [],
nonterminals = this.nonterminals,
operators = this.operators,

0 comments on commit a900315

Please sign in to comment.