diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-02 11:42:35 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-02 11:42:35 -0400 |
| commit | 7f18913e6de848dddcb4a76841992dd2d6796d52 (patch) | |
| tree | cd37044dc121e6746a29a373b915ce1a763c2882 /libs/ardour/ardour/file_source.h | |
| parent | 8c9749e42faf7808034ed8b7afce4a2fe6dc6f33 (diff) | |
fix errors in manual conflict resolution
Diffstat (limited to 'libs/ardour/ardour/file_source.h')
| -rw-r--r-- | libs/ardour/ardour/file_source.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h index c0e4fba0de..37a7e67d2e 100644 --- a/libs/ardour/ardour/file_source.h +++ b/libs/ardour/ardour/file_source.h @@ -85,9 +85,6 @@ public: void existence_check (); virtual void prevent_deletion (); - void existence_check (); - virtual void prevent_deletion (); - protected: FileSource (Session& session, DataType type, const std::string& path, |