kylefang/AsyncDisplayKit
1
0
Fork 0
mirror of https://github.com/HackPlan/AsyncDisplayKit.git synced 2026-03-29 08:39:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fixEndOfFileNewlines' of https://github.com/facebook/AsyncDisplayKit into fixEndOfFileNewlines

Browse Source
This commit is contained in:
Hannah Trosi
2016-08-18 14:44:50 -07:00
parent 036c7f1f28 b554e1e133
commit a70216f554
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
AsyncDisplayKit.xcodeproj/project.pbxproj
View File

@@ -1878,7 +1878,11 @@
isa = PBXNativeTarget;
buildConfigurationList = 058D09D2195D04C000B7D73C /* Build configuration list for PBXNativeTarget "AsyncDisplayKitTests" */;
buildPhases = (
<<<<<<< HEAD
B29C7F4E5E72CBDC82939605 /* [CP] Check Pods Manifest.lock */,
=======
B29C7F4E5E72CBDC82939605 /* 📦 Check Pods Manifest.lock */,
>>>>>>> b554e1e1336d1aa658a99e519e96edbfb8e5f0b1
2E61B6A0DB0F436A9DDBE86F /* [CP] Check Pods Manifest.lock */,
058D09B8195D04C000B7D73C /* Sources */,
058D09B9195D04C000B7D73C /* Frameworks */,
@@ -2047,14 +2051,22 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AsyncDisplayKitTests/Pods-AsyncDisplayKitTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
<<<<<<< HEAD
B29C7F4E5E72CBDC82939605 /* [CP] Check Pods Manifest.lock */ = {
=======
B29C7F4E5E72CBDC82939605 /* 📦 Check Pods Manifest.lock */ = {
>>>>>>> b554e1e1336d1aa658a99e519e96edbfb8e5f0b1
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
<<<<<<< HEAD
name = "[CP] Check Pods Manifest.lock";
=======
name = "📦 Check Pods Manifest.lock";
>>>>>>> b554e1e1336d1aa658a99e519e96edbfb8e5f0b1
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;