2.1.4

modo-studio · Dec 26, 2015 · 366a817 · 366a817
1 parent bca296c
commit 366a817
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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'