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/backupstore/BackupStoreConfigVerify.cpp | |
parent | e0eb815b67734abd09ff41e2271630d4b2a6d760 (diff) |
Fixup botched merge
Diffstat (limited to 'lib/backupstore/BackupStoreConfigVerify.cpp')
-rw-r--r-- | lib/backupstore/BackupStoreConfigVerify.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/backupstore/BackupStoreConfigVerify.cpp b/lib/backupstore/BackupStoreConfigVerify.cpp index c2344634..921adfa4 100644 --- a/lib/backupstore/BackupStoreConfigVerify.cpp +++ b/lib/backupstore/BackupStoreConfigVerify.cpp @@ -38,17 +38,7 @@ static const ConfigurationVerifyKey verifyrootkeys[] = ConfigTest_Exists | ConfigTest_IsInt), ConfigurationVerifyKey("ExtendedLogging", ConfigTest_IsBool, false), // make value "yes" to enable in config file -<<<<<<< HEAD - - #ifdef WIN32 - ConfigurationVerifyKey("RaidFileConf", ConfigTest_LastEntry) - #else - ConfigurationVerifyKey("RaidFileConf", ConfigTest_LastEntry, - BOX_FILE_RAIDFILE_DEFAULT_CONFIG) - #endif -======= ConfigurationVerifyKey("RaidFileConf", ConfigTest_LastEntry) ->>>>>>> 0.12 }; const ConfigurationVerify BackupConfigFileVerify = |