diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
| commit | e0eb815b67734abd09ff41e2271630d4b2a6d760 (patch) | |
| tree | 0df971c34f98d2a1dfd0921524a17d561a4a6536 /lib/backupstore/BackupStoreConfigVerify.cpp | |
| parent | 676c9e1c9d4ac8eb8a440d7f11c4ac44f98f4a6a (diff) | |
| parent | e19a5db232e1ef90e9a02159d2fbd9707ffe4373 (diff) | |
merge upstream version 0.12
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 = |