Fix merge error

a626ea13 · Aaron Cuevas Lopez · 69ffe832 · a626ea13 · a626ea13
Commit a626ea13 authored 10 years ago by Aaron Cuevas Lopez
--- a/Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
+++ b/Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
--- a/Source/Processors/RecordNode.h
+++ b/Source/Processors/RecordNode.h
@@ -132,11 +132,6 @@ public:
    /** Generate a Matlab-compatible datestring */
    String generateDateString();

-    CriticalSection* getLock()
-    {
-        return &diskWriteLock;
-    }
-
 private:

    /** Keep the RecordNode informed of acquisition and record states.