Fix merge erorr in previous cherry-pick

2016-02-05 09:03:59 -08:00 · 2016-02-05 09:03:59 -08:00 · f300da40d0
commit f300da40d0
parent b8f656767a
1 changed files with 2 additions and 2 deletions
--- a/db/db_test_util.cc
+++ b/db/db_test_util.cc
@ -89,8 +89,8 @@ bool DBTestBase::ChangeOptions(int skip_mask) {
        option_config_ == kUniversalCompaction ||
        option_config_ == kUniversalCompactionMultiLevel ||
        option_config_ == kUniversalSubcompactions ||
-        option_config_ == kFIFOCompaction) ||
-        option_config == kConcurrentSkipList) {
+        option_config_ == kFIFOCompaction ||
+        option_config_ == kConcurrentSkipList) {
      continue;
    }
 #endif