Fix conflict

This commit is contained in:
Vesa committed 2014-11-25 21:29:00 +02:00
1 parent eea784ce71
commit ed11ccbf50
17 files changed
-18

No files matched your search

@@ -190,5 +190,3 @@ void SpectrumAnalyzerControlDialog::paintEvent( QPaintEvent * )
}
#include "moc_SpectrumAnalyzerControlDialog.cxx"