Fix pbxproj merge issue.

dyerc · Mar 20, 2022 · 1b477b1 · 1b477b1
1 parent 7cecb4f
commit 1b477b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Doughnut.xcodeproj/project.pbxproj b/Doughnut.xcodeproj/project.pbxproj
@@ -285,6 +285,8 @@
 				6B571B4627E74C31008E1534 /* Fixtures */,
 			);
 			path = ModelTests;
+			sourceTree = "<group>";
+		};
 		6BB11F9A27A292A3009CBAF8 /* CrashReport */ = {
 			isa = PBXGroup;
 			children = (

diff --git a/Podfile.lock b/Podfile.lock
@@ -40,4 +40,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: eda8b35c82199a93c745135e96097d7a487d5530
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3
Original file line number	Diff line number	Diff line change
Expand Up		@@ -40,4 +40,4 @@ SPEC CHECKSUMS:

		PODFILE CHECKSUM: eda8b35c82199a93c745135e96097d7a487d5530

		COCOAPODS: 1.11.2
		COCOAPODS: 1.11.3