From 366a817c0cff34ab958e4c157d07bb9fa1b0fcc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pedro=20Pi=C3=B1era?= <pepibumur@gmail.com>
Date: Sun, 27 Dec 2015 00:16:06 +0100
Subject: [PATCH] 2.1.4

---
 CHANGELOG.md        | 5 ++++-
 SugarRecord.podspec | 3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb23d33f..7ba49870 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
-### Version 2.2.2
+### Version 2.1.4
+- Integrated with Travis-CI
+
+### Version 2.1.2
 - First version giving support to [RxSwift](https://github.com/ReactiveX/RxSwift)
 - Fixed broken unit tests after the refactor for Carthage for having `SugarRecordCoreData` and `SugarRecordRealm`
 
diff --git a/SugarRecord.podspec b/SugarRecord.podspec
index b4b18b65..b31f81a4 100644
--- a/SugarRecord.podspec
+++ b/SugarRecord.podspec
@@ -1,7 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "SugarRecord"
-<<<<<<< 0f3a815a5d5edfad807b59fa0f068358568d5431
-  s.version          = "2.1.3"
+  s.version          = "2.1.4"
   s.summary          = "CoreData wrapper written on Swift"
   s.homepage         = "https://github.com/SwiftReactive/SugarRecord"
   s.license          = 'MIT'