summaryrefslogtreecommitdiff
path: root/lib/backupstore/BackupStoreConfigVerify.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/backupstore/BackupStoreConfigVerify.cpp')
-rw-r--r--lib/backupstore/BackupStoreConfigVerify.cpp10
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 =