Merge branch 'corestore2_develop' into corestore2_develop_objc

# Conflicts:
#	Sources/Migrating/MigrationChain.swift
This commit is contained in:
John Rommel Estropia
2016-03-23 21:24:30 +09:00
4 changed files with 4 additions and 3 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