From bb518b62b3042010aa2db59d10a3c6690c816096 Mon Sep 17 00:00:00 2001
From: Landon Abney <Landonabney@gmail.com>
Date: Fri, 23 Jun 2017 14:33:04 -0700
Subject: [PATCH] Prepare v3.1.4 release

---
 CHANGELOG.md | 11 +++++++++++
 package.json |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06436a3..030b979 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Change Log
 
+## [v3.1.4](https://github.com/AtomLinter/linter-jshint/tree/v3.1.4) (2017-06-23)
+[Full Changelog](https://github.com/AtomLinter/linter-jshint/compare/v3.1.3...v3.1.4)
+
+**Implemented enhancements:**
+
+- Cache debug information where possible [\#418](https://github.com/AtomLinter/linter-jshint/pull/418) ([Arcanemagus](https://github.com/Arcanemagus))
+
+**Fixed bugs:**
+
+- Atom Helper using 100% of CPU on Mac OS when escaping new lines '\' for a big string [\#410](https://github.com/AtomLinter/linter-jshint/issues/410)
+
 ## [v3.1.3](https://github.com/AtomLinter/linter-jshint/tree/v3.1.3) (2017-06-23)
 [Full Changelog](https://github.com/AtomLinter/linter-jshint/compare/v3.1.2...v3.1.3)
 
diff --git a/package.json b/package.json
index c4da276..bb37a7e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "linter-jshint",
   "main": "./lib/main.js",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "description": "Linter plugin for JavaScript, using jshint",
   "repository": "https://github.com/AtomLinter/linter-jshint.git",
   "license": "MIT",