From 57e11a721b4748a550c5e46837f273c37d81b42b Mon Sep 17 00:00:00 2001
From: "chunmao.guo" <chunmao.guo@bambulab.com>
Date: Fri, 20 Sep 2024 11:03:57 +0800
Subject: [PATCH] FIX: resolve merge conflict of StatusPanel.cpp

jira: no-jira

Change-Id: Ia40e50197a39fe378455e46802b32c79ed409055
---
 src/slic3r/GUI/StatusPanel.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp
index 15425f387..69848cdf5 100644
--- a/src/slic3r/GUI/StatusPanel.cpp
+++ b/src/slic3r/GUI/StatusPanel.cpp
@@ -2576,11 +2576,6 @@ void StatusPanel::update_ams(MachineObject *obj)
         m_ams_control->show_auto_refill(false);
     }
     else {
-<<<<<<< HEAD   (26a4fc ENH: refresh_agora_url callback)
-=======
-
-        m_ams_control->SetAmsModel(ams_mode, ams_mode);
->>>>>>> CHANGE (d6c7f0 NEW: reimpl wxMediaCtrl from ffmpeg)
 
         m_ams_control->SetAmsModel(ams_mode, ams_mode);
         show_ams_group(true);