mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: resolve merge conflict of StatusPanel.cpp 

jira: no-jira

Change-Id: Ia40e50197a39fe378455e46802b32c79ed409055
This commit is contained in:
chunmao.guo 2024-09-20 11:03:57 +08:00 committed by Lane.Wei
parent 38c5c25cdd
commit 57e11a721b
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/slic3r/GUI/StatusPanel.cpp
View File

@ -2576,11 +2576,6 @@ void StatusPanel::update_ams(MachineObject *obj)
m_ams_control->show_auto_refill(false); m_ams_control->show_auto_refill(false);
} }
else { 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); m_ams_control->SetAmsModel(ams_mode, ams_mode);
show_ams_group(true); show_ams_group(true);