diff options
Diffstat (limited to 'lib/backupstore/BackupStoreAccounts.h')
| -rw-r--r-- | lib/backupstore/BackupStoreAccounts.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/backupstore/BackupStoreAccounts.h b/lib/backupstore/BackupStoreAccounts.h index e0e420bb..3163f15c 100644 --- a/lib/backupstore/BackupStoreAccounts.h +++ b/lib/backupstore/BackupStoreAccounts.h @@ -13,10 +13,7 @@ #include <string> #include "BackupStoreAccountDatabase.h" -<<<<<<< HEAD -======= #include "NamedLock.h" ->>>>>>> 0.12 // -------------------------------------------------------------------------- // @@ -35,12 +32,8 @@ private: BackupStoreAccounts(const BackupStoreAccounts &rToCopy); public: -<<<<<<< HEAD - void Create(int32_t ID, int DiscSet, int64_t SizeSoftLimit, int64_t SizeHardLimit, const std::string &rAsUsername); -======= void Create(int32_t ID, int DiscSet, int64_t SizeSoftLimit, int64_t SizeHardLimit, const std::string &rAsUsername); ->>>>>>> 0.12 bool AccountExists(int32_t ID); void GetAccountRoot(int32_t ID, std::string &rRootDirOut, int &rDiscSetOut) const; @@ -49,10 +42,7 @@ public: { return MakeAccountRootDir(rEntry.GetID(), rEntry.GetDiscSet()); } -<<<<<<< HEAD -======= void LockAccount(int32_t ID, NamedLock& rNamedLock); ->>>>>>> 0.12 private: static std::string MakeAccountRootDir(int32_t ID, int DiscSet); |