diff options
Diffstat (limited to 'lib/backupstore/BackupStoreConfigVerify.cpp')
| -rw-r--r-- | lib/backupstore/BackupStoreConfigVerify.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/backupstore/BackupStoreConfigVerify.cpp b/lib/backupstore/BackupStoreConfigVerify.cpp index cc6efcf5..c2344634 100644 --- a/lib/backupstore/BackupStoreConfigVerify.cpp +++ b/lib/backupstore/BackupStoreConfigVerify.cpp @@ -38,6 +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) @@ -45,6 +46,9 @@ static const ConfigurationVerifyKey verifyrootkeys[] = ConfigurationVerifyKey("RaidFileConf", ConfigTest_LastEntry, BOX_FILE_RAIDFILE_DEFAULT_CONFIG) #endif +======= + ConfigurationVerifyKey("RaidFileConf", ConfigTest_LastEntry) +>>>>>>> 0.12 }; const ConfigurationVerify BackupConfigFileVerify = |