aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHsiangNianian <i@jyunko.cn>2025-05-25 11:02:04 +0800
committerHsiangNianian <i@jyunko.cn>2025-05-25 11:02:04 +0800
commit50149c1872098945b6942a22f8c638403b7eed8b (patch)
treeb7a25fe0a3283fb547f62416f2c56a8bad7cac48
parentda57e4f6ea6b2f7defc9d207aa50b3fd6ac5e38f (diff)
downloadsoon-50149c1872098945b6942a22f8c638403b7eed8b.tar.gz
soon-50149c1872098945b6942a22f8c638403b7eed8b.zip
feat: Update .gitignore to include Cargo.lock and modify uv.lock entry
-rw-r--r--.gitignore5
-rw-r--r--Cargo.lock14
2 files changed, 5 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore
index 0a19790..c5ab8a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,7 +98,7 @@ ipython_config.py
# Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
-#uv.lock
+uv.lock
# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
@@ -172,3 +172,6 @@ cython_debug/
# PyPI configuration file
.pypirc
+
+# Cargo Lock
+Cargo.lock \ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 28eecc8..d139ffa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -246,19 +246,7 @@ dependencies = [
[[package]]
name = "soon"
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-version = "0.1.3"
-=======
-version = "0.1.1"
->>>>>>> 63967be (feat: Bump version to 0.1.1 in Cargo.toml and Cargo.lock)
-=======
-version = "0.1.2"
->>>>>>> fc7b603 (feat: Bump version to 0.1.2 in Cargo.toml, Cargo.lock, and PKGBUILD)
-=======
-version = "0.1.2"
->>>>>>> dab388da8e452a4f82f1297bf20c48254028d1c1
+version = "0.1.4"
dependencies = [
"clap",
"colored",