Merge branch 'develop' into corestore2_develop

# Conflicts:
#	CoreStore.podspec
#	CoreStore/CartFile
#	README.md
#	Sources/Info.plist
#	Sources/Internal/NSManagedObjectModel+Setup.swift
#	Sources/Logging/CoreStore+Logging.swift
This commit is contained in:
John Rommel Estropia
2016-03-23 21:23:08 +09:00
5 changed files with 5 additions and 4 deletions

View File

@@ -154,7 +154,7 @@ internal extension NSManagedObjectModel {
}
@nonobjc internal func entityTypesMapping() -> [String: NSManagedObject.Type] {
var mapping = [String: NSManagedObject.Type]()
self.entityNameMapping.forEach { (className, entityName) in