Version 1.2.1

marcbachmann · marcbachmann · commit 46b36292b66d · 2015-06-14T09:29:54.000-07:00
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,8 @@
+1.2.1
+=====
+- Remove 2 minute force timeout [#40](https://github.com/marcbachmann/node-html-pdf/issues/40)
+
+
 1.2.0
 =====
 - Add `options.phantomArgs` option requested in [#22](https://github.com/marcbachmann/node-html-pdf/issues/22)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "html-pdf",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "HTML to PDF converter that uses phantomjs",
   "main": "lib/index.js",
   "directories": {

-Original file line number
+Diff line change
@@ @@ -1,3 +1,8 @@ @@
 +1.2.1
 +=====
 +- Remove 2 minute force timeout [#40](https://github.com/marcbachmann/node-html-pdf/issues/40)
++
++
 .2.0
 =====
 - Add `options.phantomArgs` option requested in [#22](https://github.com/marcbachmann/node-html-pdf/issues/22)
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "html-pdf",`
`3`		`- "version": "1.2.0",`
	`3`	`+ "version": "1.2.1",`
`4`	`4`	`"description": "HTML to PDF converter that uses phantomjs",`
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"directories": {`