try to resolve conflicts

pull/744/head
Ömer Şiar Baysal 1 week ago
parent df387faa67
commit b66058b17f
  1. 1
      src/minidexed.cpp

@ -60,7 +60,6 @@ CMiniDexed::CMiniDexed (CConfig *pConfig, CInterruptSystem *pInterrupt,
m_bSetNewPerformance (false), m_bSetNewPerformance (false),
m_bDeletePerformance (false), m_bDeletePerformance (false),
m_bLoadPerformanceBusy(false), m_bLoadPerformanceBusy(false),
m_pNet(nullptr), m_pNet(nullptr),
m_pNetDevice(nullptr), m_pNetDevice(nullptr),
m_WLAN(WLANFirmwarePath), m_WLAN(WLANFirmwarePath),

Loading…
Cancel
Save