Version number bump and changelog update

Marlow Payne · Marlow Payne · commit 60804f8cc115 · 2015-07-03T11:39:40.000-07:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2.2.0
+    - Fixes eslint config to play nicely with Atom's linter-eslint package
+    - Adds an eslint config reset file so that our ruleset is an override
 2.1.1
     - Re-publish to work-around NPM issue
 2.1.0
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mobify-code-style",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "Code style guide and linting tools for Mobify",
   "main": "index.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "mobify-code-style",`
`3`		`- "version": "2.1.1",`
	`3`	`+ "version": "2.2.0",`
`4`	`4`	`"description": "Code style guide and linting tools for Mobify",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`