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 ebf2003..a428d34 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -246,7 +246,11 @@ dependencies = [
[[package]]
name = "soon"
+<<<<<<< HEAD
version = "0.1.3"
+=======
+version = "0.1.1"
+>>>>>>> 63967be (feat: Bump version to 0.1.1 in Cargo.toml and Cargo.lock)
dependencies = [
"clap",
"colored",