Merge branch 'master' of https://github.com/AndersDJohnson/conventional-commit-types

AndersDJohnson · AndersDJohnson · commit c3b9f98106ef · 2017-07-03T18:15:14.000-05:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "conventional-commit-types",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "List of conventional commit types.",
   "main": "index.json",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "conventional-commit-types",`
`3`		`- "version": "2.0.0",`
	`3`	`+ "version": "2.1.0",`
`4`	`4`	`"description": "List of conventional commit types.",`
`5`	`5`	`"main": "index.json",`
`6`	`6`	`"scripts": {`