fix errors in manual conflict resolution
authorPaul Davis <paul@linuxaudiosystems.com>
Mon, 2 Jun 2014 15:42:35 +0000 (11:42 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 2 Jun 2014 15:42:35 +0000 (11:42 -0400)
commit7f18913e6de848dddcb4a76841992dd2d6796d52
treecd37044dc121e6746a29a373b915ce1a763c2882
parent8c9749e42faf7808034ed8b7afce4a2fe6dc6f33
fix errors in manual conflict resolution
libs/ardour/ardour/file_source.h
libs/ardour/ardour/smf_source.h
libs/pbd/clear_dir.cc
libs/pbd/pbd/clear_dir.h