merge master

cjcchen · cjcchen · commit 8329eec47422 · 2025-02-13T12:51:36.000-07:00
diff --git a/platform/proto/replica_info.proto b/platform/proto/replica_info.proto
@@ -64,11 +64,6 @@ message ResConfigData{
   optional int32 max_client_complaint_num = 21;
 
   optional int32 duplicate_check_frequency_useconds = 22;
-  optional bool multiply_primary = 23;
-
-  // for poe
-  optional int32 water_mark = 24;
-  optional bool is_linear = 25;
 }
 
 message ReplicaStates {
diff --git a/platform/proto/resdb.proto b/platform/proto/resdb.proto
@@ -88,10 +88,7 @@ message Request {
     int64 uid = 23;
     int64 create_time = 24;
     int64 commit_time = 25;
-<<<<<<< HEAD
     bytes data_hash = 26;
-=======
->>>>>>> master
 }
 
 // The response message containing response
