3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

FIX: fix the conflict

Browse source 
Change-Id: Id5f2bf11344e9d42302420d167daa3af1c3c1845
This commit is contained in:
zhimin.zeng 2023-05-30 09:44:09 +08:00 • committed by Lane.Wei
parent c1c990051d
commit 032bf107b8
3 changed files with 1 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/MainFrame.hpp
View file

@ -339,12 +339,8 @@ public:
//AuxiliaryPanel* m_auxiliary{ nullptr };
ProjectPanel* m_project{ nullptr };
<<<<<<< HEAD (88f268 FIX: wipe tower is not generated with different filament lay)
=======
CalibrationPanel* m_calibration{ nullptr };
DebugToolDialog* m_debug_tool_dlg{ nullptr };
>>>>>>> CHANGE (cbac2c NEW: add calibration)
WebViewPanel* m_webview { nullptr };
wxLogWindow* m_log_window { nullptr };
// BBS