2 files changed, 8 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",
diff --git a/Cargo.toml b/Cargo.toml
index 2209a7d..b5a6164 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,10 @@
 [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)
 edition = "2021"
 description = "Predict your next shell command based on history — like shell autocomplete, but MORE stupid"
 license = "MIT"