Fix merge.

ggarra13 · Mar 12, 2024 · 3633144 · 3633144
1 parent f74e5b5
commit 3633144
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/lib/tlTimeline/PlayerPrivate.cpp b/lib/tlTimeline/PlayerPrivate.cpp
@@ -803,11 +803,7 @@ namespace tl
 
                 // Send audio data to RtAudio.
                 const auto now = std::chrono::steady_clock::now();
-<<<<<<< HEAD
-                if (!externalTime &&
-=======
                 if (speed == p->timeline->getTimeRange().duration().rate() &&
->>>>>>> 7ddaed7355b0ffa73b983c27c04a326dcce3aac2
                     !mute &&
                     now >= muteTimeout &&
                     nFrames <= getSampleCount(p->audioThread.buffer))