Revert "fix:Revise the value check for max-rsync-parallel-num to prev…

…ent a core dump when it is set to a value greater than 4 (#2595)"

This reverts commit f6d72f2.

conf/pika.conf

@@ -439,14 +439,10 @@ default-slot-num : 1024
 # [USED BY SLAVE] The transmitting speed(Rsync Rate) In full replication is controlled BY SLAVE NODE, You should modify the throttle-bytes-per-second in slave's pika.conf if you wanna change the rsync rate limit.
 # [Dynamic Change Supported] send command 'config set throttle-bytes-per-second new_value' to SLAVE NODE can dynamically adjust rsync rate during full sync(use config rewrite can persist the changes).
 throttle-bytes-per-second : 207200000
-<<<<<<< HEAD
 # Rsync timeout in full sync stage[Default value is 1000 ms], unnecessary retries will happen if this value is too small.
 # [Dynamic Change Supported] similar to throttle-bytes-per-second, rsync-timeout-ms can be dynamically changed by configset command
 # [USED BY SLAVE] Similar to throttle-bytes-per-second, you should change rsync-timeout-ms's value in slave's conf file if it is needed to adjust.
 rsync-timeout-ms : 1000
-=======
-
->>>>>>> b58beb09 (fix:Revise the value check for max-rsync-parallel-num to prevent a core dump when it is set to a value greater than 4 (#2595))
 # The valid range for max-rsync-parallel-num is [1, 4].
 # If an invalid value is provided, max-rsync-parallel-num will automatically be reset to 4.
 max-rsync-parallel-num : 4