fix manual merge error
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 26 Feb 2016 04:15:18 +0000 (23:15 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 31 May 2016 19:30:38 +0000 (15:30 -0400)
commit3819d4f9eda7e7dc827f3c97a6e12c0385e4579b
tree49b583d55bb93f43d3febe4e1c357832b5e554e1
parent0e1190c5551101c51a6fc7536dc9d2f38bdcae86
fix manual merge error
gtk2_ardour/ardour_ui_dependents.cc