Merge branch 'corestore2_develop' into corestore2_develop_objc

# Conflicts:
#	Sources/Observing/ListMonitor.swift
This commit is contained in:
John Rommel Estropia
2016-03-30 21:41:44 +09:00
3 changed files with 11 additions and 10 deletions

View File

@@ -84,7 +84,7 @@ internal extension NSManagedObjectContext {
var result = SaveResult(hasChanges: false)
self.performBlockAndWait { [unowned self] () -> Void in
self.performBlockAndWait {
guard self.hasChanges else {
@@ -129,7 +129,7 @@ internal extension NSManagedObjectContext {
@nonobjc
internal func saveAsynchronouslyWithCompletion(completion: ((result: SaveResult) -> Void) = { _ in }) {
self.performBlock { () -> Void in
self.performBlock {
guard self.hasChanges else {