fix: resolve merge conflict

swpu-acm · Dec 24, 2024 · a4515b5 · a4515b5
1 parent 27fe24e
commit a4515b5
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/.zsh_history b/.zsh_history
@@ -0,0 +1,23 @@
+cargo test
+cargo test
+cargo test
+cargo fmt --all -- --check && cargo clippy --all-features -- -D warnings\
+
+cargo test
+git commit -m "feat: suport get, remove, add, update"
+git add .
+git commit -m "feat: suport get, remove, add, update"
+git push
+git push
+git push
+git push
+git push
+git push
+git push
+git push
+git push
+git push
+git push
+git push
+git push
+git push
diff --git a/1000 b/1000
@@ -0,0 +1,8 @@
+surreal start --user root --pass root --bind 127.0.0.1:5176\
+
+surreal start --user root --pass root --bind 127.0.0.1:5176\
+
+surreal start --user root --pass root --bind 127.0.0.1:5176\
+
+surreal start --user root --pass root --bind 127.0.0.1:5176\
+
diff --git a/Cargo.lock b/Cargo.lock