diff options
Diffstat (limited to 'lib/raidfile/RaidFileController.h')
| -rw-r--r-- | lib/raidfile/RaidFileController.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/raidfile/RaidFileController.h b/lib/raidfile/RaidFileController.h index b2b8cb0d..601cca22 100644 --- a/lib/raidfile/RaidFileController.h +++ b/lib/raidfile/RaidFileController.h @@ -49,11 +49,7 @@ public: int GetSetID() const {return mSetID;} int GetSetNumForWriteFiles(const std::string &rFilename) const; -<<<<<<< HEAD - -======= int GetSetNumForWriteFiles(const char* filename) const; ->>>>>>> 0.12 unsigned int GetBlockSize() const {return mBlockSize;} // Is this disc set a non-RAID disc set? (ie files never get transformed to raid storage) |