smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-10 15:36:24 +01:00
Code Issues Projects Releases Wiki Activity

remove mistakenly left-in merge conflict line

Browse source
This commit is contained in:
Paul Davis 2015-02-19 18:20:38 -05:00
parent f24be24b1b
commit 0b0d20916e
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libs/ardour/ardour/audioengine.h
View file

@ -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