From 2d6132a01df2311c00f13e49334b9fad07ec4904 Mon Sep 17 00:00:00 2001
From: cochcoder <103969142+cochcoder@users.noreply.github.com>
Date: Mon, 6 May 2024 14:50:49 -0400
Subject: [PATCH] Resolve merge conflicts part 1

---
 resources/profiles/Flashforge.json | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/resources/profiles/Flashforge.json b/resources/profiles/Flashforge.json
index a0475e5bcf..eb6a9c894a 100644
--- a/resources/profiles/Flashforge.json
+++ b/resources/profiles/Flashforge.json
@@ -20,10 +20,6 @@
     {
       "name": "Flashforge Guider 3 Ultra",
       "sub_path": "machine/Flashforge Guider 3 Ultra.json"
-    },
-    {
-      "name": "Flashforge Guider 2s",
-      "sub_path": "machine/Flashforge Guider 2s.json"
     }
   ],
   "process_list": [
@@ -74,22 +70,6 @@
     {
       "name": "0.20mm Standard @Flashforge G3U 0.4 Nozzle",
       "sub_path": "process/0.20mm Standard @Flashforge G3U 0.4 Nozzle.json"
-    },
-    {
-      "name": "0.30mm Draft @Flashforge Guider 2s 0.4 nozzle",
-      "sub_path": "process/0.30mm Draft @Flashforge Guider 2s 0.4 nozzle.json"
-    },
-    {
-      "name": "0.20mm Standard @Flashforge Guider 2s 0.4 nozzle",
-      "sub_path": "process/0.20mm Standard @Flashforge Guider 2s 0.4 nozzle.json"
-    },
-    {
-      "name": "0.16mm Optimal @Flashforge Guider 2s 0.4 nozzle",
-      "sub_path": "process/0.16mm Optimal @Flashforge Guider 2s 0.4 nozzle.json"
-    },
-    {
-      "name": "0.12mm Detail @Flashforge Guider 2s 0.4 nozzle",
-      "sub_path": "process/0.12mm Detail @Flashforge Guider 2s 0.4 nozzle.json"
     }
   ],
   "filament_list": [
@@ -270,10 +250,6 @@
     {
       "name": "Flashforge Guider 3 Ultra 0.4 Nozzle",
       "sub_path": "machine/Flashforge Guider 3 Ultra 0.4 Nozzle.json"
-    },
-    {
-      "name": "Flashforge Guider 2s 0.4 nozzle",
-      "sub_path": "machine/Flashforge Guider 2s 0.4 nozzle.json"
     }
   ]
 }