From 097e435e20a3a458f4d3656bad4fdb1f218f2f06 Mon Sep 17 00:00:00 2001
From: cochcoder <103969142+cochcoder@users.noreply.github.com>
Date: Mon, 6 May 2024 14:57:21 -0400
Subject: [PATCH] Fix merge conflicts 1.75

---
 .../profiles/Flashforge/filament/Flashforge Generic ASA.json   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ASA.json b/resources/profiles/Flashforge/filament/Flashforge Generic ASA.json
index 4c99fdedbb..5fe7a2172b 100644
--- a/resources/profiles/Flashforge/filament/Flashforge Generic ASA.json	
+++ b/resources/profiles/Flashforge/filament/Flashforge Generic ASA.json	
@@ -18,7 +18,8 @@
   ],
   "compatible_printers": [
     "Flashforge Adventurer 5M Pro 0.4 Nozzle",
-    "Flashforge Guider 2s 0.4 nozzle"
+    "Flashforge Adventurer 5M Pro 0.6 Nozzle",
+    "Flashforge Adventurer 5M Pro 0.8 Nozzle"	
   ],
   "compatible_printers_condition": "",
   "compatible_prints": [],