Merge branch 'master' into issues/157

jneen · Jun 6, 2017 · 9e6bbb8 · 9e6bbb8
2 parents 354a16d + 81fa365
commit 9e6bbb8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+*.js text eol=lf
diff --git a/API.md b/API.md
@@ -122,7 +122,7 @@ This is an alias for `Parsimmon.regexp`.
 
 ## Parsimmon.notFollowedBy(parser)
 
-Parses using `parser`, but does not consume what it parses. Yields an empty string if the parser *does not match* the input. Otherwise it fails.
+Parses using `parser`, but does not consume what it parses. Yields `null` if the parser *does not match* the input. Otherwise it fails.
 
 ## Parsimmon.lookahead(parser)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "parsimmon",
- "version": "1.2.0",
+ "version": "1.3.0",
  "description": "A monadic LL(infinity) parser combinator library",
  "keywords": [
  "parsing",