mirror of
https://github.com/zhigang1992/MagicalRecord.git
synced 2026-04-29 04:25:46 +08:00
05b95c08fa
Conflicts: Project Files/Mac App Unit Tests/Frameworks/GHUnit.framework/GHUnit Project Files/Mac App Unit Tests/Frameworks/GHUnit.framework/Headers Project Files/Mac App Unit Tests/Frameworks/GHUnit.framework/Resources Project Files/Mac App Unit Tests/Frameworks/GHUnit.framework/Versions/Current Project Files/Mac App Unit Tests/Frameworks/OCHamcrest.framework/Headers Project Files/Mac App Unit Tests/Frameworks/OCHamcrest.framework/OCHamcrest Project Files/Mac App Unit Tests/Frameworks/OCHamcrest.framework/Resources Project Files/Mac App Unit Tests/Frameworks/OCHamcrest.framework/Versions/Current Project Files/Mac App Unit Tests/Frameworks/OCMock.framework/Headers Project Files/Mac App Unit Tests/Frameworks/OCMock.framework/OCMock Project Files/Mac App Unit Tests/Frameworks/OCMock.framework/Resources Project Files/Mac App Unit Tests/Frameworks/OCMock.framework/Versions/Current Project Files/Magical Record.xcodeproj/project.pbxproj Project Files/Unit Tests/MagicalDataImportTestCase.h Project Files/iOS App Unit Tests/Frameworks/GHUnitIOS.framework/GHUnitIOS Project Files/iOS App Unit Tests/Frameworks/GHUnitIOS.framework/Headers Project Files/iOS App Unit Tests/Frameworks/GHUnitIOS.framework/Resources Project Files/iOS App Unit Tests/Frameworks/GHUnitIOS.framework/Versions/Current Project Files/iOS App Unit Tests/Frameworks/OCHamcrestIOS.framework/Headers Project Files/iOS App Unit Tests/Frameworks/OCHamcrestIOS.framework/OCHamcrestIOS Project Files/iOS App Unit Tests/Frameworks/OCHamcrestIOS.framework/Resources Project Files/iOS App Unit Tests/Frameworks/OCHamcrestIOS.framework/Versions/Current Project Files/iOS App Unit Tests/Frameworks/OCMock.framework/Headers Project Files/iOS App Unit Tests/Frameworks/OCMock.framework/OCMock Project Files/iOS App Unit Tests/Frameworks/OCMock.framework/Resources Project Files/iOS App Unit Tests/Frameworks/OCMock.framework/Versions/Current