From 5499007bc39129aaeba4002c0b8273a3e137795a Mon Sep 17 00:00:00 2001
From: "xun.zhang" <xun.zhang@bambulab.com>
Date: Thu, 12 Jun 2025 15:44:54 +0800
Subject: [PATCH] FIX: solve the conflict

jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: If3862fbf7a543283ff77d4511d7c321a6e24d38b
(cherry picked from commit 162b5ac65f74cc8ec8c5bfa285d630d165aee437)
---
 resources/profiles/BBL/machine/Bambu Lab H2 0.4 nozzle.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/resources/profiles/BBL/machine/Bambu Lab H2 0.4 nozzle.json b/resources/profiles/BBL/machine/Bambu Lab H2 0.4 nozzle.json
index ec77b34ad4..56270c66a4 100644
--- a/resources/profiles/BBL/machine/Bambu Lab H2 0.4 nozzle.json	
+++ b/resources/profiles/BBL/machine/Bambu Lab H2 0.4 nozzle.json	
@@ -158,12 +158,6 @@
         "Direct Drive Standard",
         "Direct Drive High Flow"
     ],
-<<<<<<< HEAD   (c3dafa ENH:[filament/process] batch modify h2 process params)
-=======
-    "extruder_variant_list": [
-        "Direct Drive Standard,Direct Drive High Flow"
-    ],
->>>>>>> CHANGE (821d61 ENH:[Process/Filament]  update timelapse and layer change gc)
     "retract_before_wipe": [
         "0%",
         "0%"