From 1fee1f53adbfa619f9d5691a12c699ecbc85fb10 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Tue, 21 May 2024 18:08:11 -0700
Subject: [PATCH] Fix conflicts in test plan files.

---
 Mac.xctestplan | 19 +++++++++++--------
 iOS.xctestplan | 10 +++++-----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Mac.xctestplan b/Mac.xctestplan
index a83bf26f3..0d513f041 100644
--- a/Mac.xctestplan
+++ b/Mac.xctestplan
@@ -47,7 +47,7 @@
     {
       "parallelizable" : true,
       "target" : {
-        "containerPath" : "container:",
+        "containerPath" : "container:Core",
         "identifier" : "CoreTests",
         "name" : "CoreTests"
       }
@@ -55,8 +55,7 @@
     {
       "parallelizable" : true,
       "target" : {
-        "containerPath" : "container:",
-<<<<<<< HEAD
+        "containerPath" : "container:Feedly",
         "identifier" : "FeedlyTests",
         "name" : "FeedlyTests"
       }
@@ -64,13 +63,17 @@
     {
       "parallelizable" : true,
       "target" : {
-        "containerPath" : "container:",
+        "containerPath" : "container:Account",
         "identifier" : "AccountTests",
         "name" : "AccountTests"
-=======
-        "identifier" : "WebTests",
-        "name" : "WebTests"
->>>>>>> 72e83becb1becceba3c41a747d377a7bfab51bf4
+      }
+    },
+    {
+        "parallelizable" : true,
+        "target" : {
+          "containerPath" : "container:Web",
+          "identifier" : "WebTests",
+          "name" : "WebTests"
       }
     }
   ],
diff --git a/iOS.xctestplan b/iOS.xctestplan
index e4d6ba852..db94c77bf 100644
--- a/iOS.xctestplan
+++ b/iOS.xctestplan
@@ -23,7 +23,7 @@
     {
       "parallelizable" : true,
       "target" : {
-        "containerPath" : "container:",
+        "containerPath" : "container:Core",
         "identifier" : "CoreTests",
         "name" : "CoreTests"
       }
@@ -31,7 +31,7 @@
     {
       "parallelizable" : true,
       "target" : {
-        "containerPath" : "container:..\/Tree",
+        "containerPath" : "container:Tree",
         "identifier" : "TreeTests",
         "name" : "TreeTests"
       }
@@ -39,7 +39,7 @@
     {
       "parallelizable" : true,
       "target" : {
-        "containerPath" : "container:",
+        "containerPath" : "container:Feedly",
         "identifier" : "FeedlyTests",
         "name" : "FeedlyTests"
       }
@@ -47,7 +47,7 @@
     {
       "parallelizable" : true,
       "target" : {
-        "containerPath" : "container:",
+        "containerPath" : "container:Account",
         "identifier" : "AccountTests",
         "name" : "AccountTests"
       }
@@ -63,7 +63,7 @@
     {
       "parallelizable" : true,
       "target" : {
-        "containerPath" : "container:",
+        "containerPath" : "container:Web",
         "identifier" : "WebTests",
         "name" : "WebTests"
       }