fix merge

This commit is contained in:
John Rommel Estropia
2016-05-07 18:13:44 +08:00
parent a6291e116c
commit 0c2a3ac4e9
4 changed files with 8 additions and 8 deletions

View File

@@ -61,7 +61,7 @@ internal extension NSManagedObjectContext {
get {
let value: NSNumber? = getAssociatedObjectForKey(
let value: NSNumber? = cs_getAssociatedObjectForKey(
&PropertyKeys.isSavingSynchronously,
inObject: self
)
@@ -69,7 +69,7 @@ internal extension NSManagedObjectContext {
}
set {
setAssociatedWeakObject(
cs_setAssociatedWeakObject(
newValue.flatMap { NSNumber(bool: $0) },
forKey: &PropertyKeys.isSavingSynchronously,
inObject: self