resolve merge issues

LMMS · Apr 14, 2019 · 062041f · 062041f
2 parents a091d50 + 8292e00
commit 062041f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/tracks/SampleTrack.cpp b/src/tracks/SampleTrack.cpp
@@ -151,8 +151,8 @@ void SampleTCO::setSampleFile( const QString & _sf )
 		float den = Engine::getSong()->getTimeSigModel().getDenominator();
 		length = DefaultTicksPerTact * ( nom / den );
 	}
-	else //Otherwise set it to the sample's length
-	{
+	else
+	{	//Otherwise set it to the sample's length
 		m_sampleBuffer->setAudioFile( _sf );
 		length = sampleLength();
 	}