git dammit

LMMS · May 10, 2020 · 31b938d · 31b938d
1 parent 5b8bd6d
commit 31b938d
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/core/Track.cpp b/src/core/Track.cpp
@@ -1148,12 +1148,9 @@ void TrackContentObjectView::mouseReleaseEvent( QMouseEvent * me )
 			//clip (bad), and a clip the same length as the original one (pointless).
 			if ( splitPos > m_initialTCOPos && splitPos < m_initialTCOEnd )
 			{
-<<<<<<< HEAD
 				leftTCO->getTrack()->addJournalCheckPoint();
 				leftTCO->getTrack()->saveJournallingState( false );
 
-=======
->>>>>>> 8e8cf2ce84df318fde62fba3b21be26c3c958699
 				SampleTCO * rightTCO = new SampleTCO ( leftTCO->getTrack() );
 				rightTCO->setSampleBuffer( leftTCO->sampleBuffer() );
 				rightTCO->setIsPlaying(leftTCO->isPlaying());