From 31b938d901d519fb14719bc5392b04e4007175e5 Mon Sep 17 00:00:00 2001
From: Spekular <Spekularr@gmail.com>
Date: Sun, 10 May 2020 19:45:57 +0200
Subject: [PATCH] git dammit

---
 src/core/Track.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/core/Track.cpp b/src/core/Track.cpp
index caf15c604fc..771f59e95f0 100644
--- 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());