From 36028aeb5c4cccc56bf14d80a98191b519f9c43d Mon Sep 17 00:00:00 2001
From: Andrew <acekane1@gmail.com>
Date: Sat, 12 May 2018 13:59:27 -0700
Subject: [PATCH] Version bump to 3.1.0 [skip ci]

---
 CHANGELOG.md              | 3 ++-
 lib/searchkick/version.rb | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93dfd13..50b012f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,9 @@
-## 3.0.4 [unreleased]
+## 3.1.0
 
 - Added `:inline` as alias for `true` for `callbacks` and `mode` options
 - Friendlier error message for bad mapping with partial matches
 - Warn when records in search index do not exist in database
+- Easier merging for `merge_mapping`
 - Fixed `with_hit` and `with_highlights` when records in search index do not exist in database
 - Fixed error with highlights and match all
 
diff --git a/lib/searchkick/version.rb b/lib/searchkick/version.rb
index c5dd6b1..8d92619 100644
--- a/lib/searchkick/version.rb
+++ b/lib/searchkick/version.rb
@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "3.0.3"
+  VERSION = "3.1.0"
 end
--
libgit2 0.21.0