correct fix previous merge conflict
authorPaul Davis <paul@linuxaudiosystems.com>
Mon, 27 Jul 2015 22:24:32 +0000 (18:24 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 22 Feb 2016 20:31:23 +0000 (15:31 -0500)
commit84de4246bb86fbdbe5cafcabba5761183bbf3d55
tree2c6f3e0614be9b4ff43b544ee14597e54ad933e1
parentd5bcf90b1a20a55fd15ac54a17577011bd75a0ae
correct fix previous merge conflict
gtk2_ardour/editor_drag.cc