aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Cargo.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Cargo.lock')
-rw-r--r--Cargo.lock4
1 files changed, 4 insertions, 0 deletions
diff --git a/Cargo.lock b/Cargo.lock
index a428d34..f84845d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -247,10 +247,14 @@ dependencies = [
[[package]]
name = "soon"
<<<<<<< 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)
dependencies = [
"clap",
"colored",