From 50149c1872098945b6942a22f8c638403b7eed8b Mon Sep 17 00:00:00 2001 From: HsiangNianian Date: Sun, 25 May 2025 11:02:04 +0800 Subject: feat: Update .gitignore to include Cargo.lock and modify uv.lock entry --- .gitignore | 5 ++++- Cargo.lock | 14 +------------- 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", -- cgit v1.2.3-70-g09d2