Resolve conflict.

Signed-off-by: Shivshankar-Reddy <[email protected]>
Shivshankar-Reddy · May 10, 2024 · 57d02f6 · 57d02f6
1 parent f9a6ae0
commit 57d02f6
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/src/server.c b/src/server.c
@@ -6931,10 +6931,8 @@ struct serverTest {
 } serverTests[] = {
     {"ziplist", ziplistTest},
     {"quicklist", quicklistTest},
-    {"sha1test", sha1Test},
     {"endianconv", endianconvTest},
     {"zmalloc", zmalloc_test},
-    {"sds", sdsTest},
     {"dict", dictTest},
     {"listpack", listpackTest},
 };