fix: resolve conflict

OpenAtomFoundation · Aug 25, 2024 · df23447 · df23447
1 parent 46eb978
commit df23447
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build.sh b/build.sh
@@ -50,7 +50,7 @@ do
       --)
               shift
               break
-              ;; 
+              ;;
       esac
 shift
 done

diff --git a/save_load.sh b/save_load.sh
@@ -15,4 +15,4 @@ redis-benchmark -p 7777 -c 5 -n 10000 -r 10000 -d 1024 -t hset
 redis-cli -p 7777 raft.node dosnapshot
 redis-benchmark -p 7777 -c 5 -n 10000 -r 10000 -d 1024 -t hset
 
-redis-cli -p 8888 raft.cluster join 127.0.0.1:7777
+redis-cli -p 8888 raft.cluster join 127.0.0.1:7777
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,7 +50,7 @@ do @@
           --)
                   shift
                   break
-                  ;;
+                  ;;
           esac
     shift
     done
@@ Expand Down @@