# Conflicts: # BoardSetting.cpp # ChannelList.cpp # ChannelSetting.cpp # CustomFilter.cpp # CustomFilter.h # CustomFilter.ui # mainwindow.cpp # sqlitedb.cpp