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

@@ -68,4 +68,3 @@ AmplifierControlDialog::AmplifierControlDialog( AmplifierControls* controls ) :
rightKnob->setHintText( tr( "Right gain:" ) + " ", "%" );
}
#include "moc_AmplifierControlDialog.cxx"