From 0b0d20916e7bec51fbe017873287cdf69f04f2aa Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 19 Feb 2015 18:20:38 -0500 Subject: [PATCH] remove mistakenly left-in merge conflict line --- libs/ardour/ardour/audioengine.h | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index 948cf8bb10..d609a4df71 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -79,7 +79,6 @@ public: ProcessThread* main_thread() const { return _main_thread; } -<<<<<<< HEAD /* START BACKEND PROXY API * * See audio_backend.h for full documentation and semantics. These wrappers