diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2017-06-14 19:53:34 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-14 19:55:14 -0400 |
| commit | e0c122119afea4c951c0c57144d26a473118c254 (patch) | |
| tree | 34a02a56f9b017201dfb721ef678c711351466d6 /lib/raidfile/RaidFileController.h | |
| parent | e0eb815b67734abd09ff41e2271630d4b2a6d760 (diff) | |
Fixup botched merge
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) |